This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 050f2f1 Fixed CS
050f2f1 is described below
commit 050f2f12c1904d5bd5d20134de2ba19c6be159d5
Author: Claus Ibsen <[email protected]>
AuthorDate: Wed Jan 22 05:18:04 2020 +0100
Fixed CS
---
.../org/apache/camel/component/grape/GrapeComponentTest.java | 9 ++++-----
.../apache/camel/component/iec60870/client/ClientConnection.java | 5 +++--
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git
a/components/camel-grape/src/test/java/org/apache/camel/component/grape/GrapeComponentTest.java
b/components/camel-grape/src/test/java/org/apache/camel/component/grape/GrapeComponentTest.java
index 7030b34..35fdb8a 100644
---
a/components/camel-grape/src/test/java/org/apache/camel/component/grape/GrapeComponentTest.java
+++
b/components/camel-grape/src/test/java/org/apache/camel/component/grape/GrapeComponentTest.java
@@ -16,13 +16,10 @@
*/
package org.apache.camel.component.grape;
-import static org.apache.camel.ServiceStatus.Stopped;
-import static
org.apache.camel.component.grape.GrapeComponent.grapeCamelContext;
-import static org.apache.camel.component.grape.GrapeEndpoint.loadPatches;
-
import java.util.Arrays;
import java.util.List;
+import groovy.lang.GroovyClassLoader;
import org.apache.camel.CamelContext;
import org.apache.camel.ServiceStatus;
import org.apache.camel.builder.RouteBuilder;
@@ -32,7 +29,9 @@ import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
-import groovy.lang.GroovyClassLoader;
+import static org.apache.camel.ServiceStatus.Stopped;
+import static
org.apache.camel.component.grape.GrapeComponent.grapeCamelContext;
+import static org.apache.camel.component.grape.GrapeEndpoint.loadPatches;
@Ignore("FIXME")
public class GrapeComponentTest extends Assert {
diff --git
a/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/client/ClientConnection.java
b/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/client/ClientConnection.java
index ed93b71..aa52a84 100644
---
a/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/client/ClientConnection.java
+++
b/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/client/ClientConnection.java
@@ -98,13 +98,14 @@ public class ClientConnection {
this.client = new AutoConnectClient(this.host, this.port,
this.options.getProtocolOptions(), factory, new StateListener() {
@Override
public void stateChanged(final State state, final Throwable e) {
- if (state == State.CONNECTED)
+ if (state == State.CONNECTED) {
latch.countDown();
+ }
}
});
try {
latch.await(this.options.getConnectionTimeout(),
TimeUnit.MILLISECONDS);
- } catch (InterruptedException ex) {
+ } catch (InterruptedException e) {
// ignore
}
}