Fixed CS. This closes #982. This closes #983.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3e1994db Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3e1994db Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3e1994db Branch: refs/heads/kube-lb Commit: 3e1994dbc7f5794d1f83551acaa21a592c73f85e Parents: 8137ea4 Author: Claus Ibsen <davscl...@apache.org> Authored: Fri May 13 08:12:00 2016 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Mon May 16 09:59:33 2016 +0200 ---------------------------------------------------------------------- .../apache/camel/component/sjms/batch/SjmsBatchComponent.java | 2 +- .../component/sjms/SjmsEndpointConnectionSettingsTest.java | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/3e1994db/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/batch/SjmsBatchComponent.java ---------------------------------------------------------------------- diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/batch/SjmsBatchComponent.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/batch/SjmsBatchComponent.java index 9029468..4bca047 100644 --- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/batch/SjmsBatchComponent.java +++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/batch/SjmsBatchComponent.java @@ -34,7 +34,7 @@ public class SjmsBatchComponent extends UriEndpointComponent { @Override protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception { ConnectionFactory cf = resolveAndRemoveReferenceParameter(parameters, "connectionFactory", ConnectionFactory.class); - if(cf != null){ + if (cf != null) { setConnectionFactory(cf); } ObjectHelper.notNull(connectionFactory, "connectionFactory"); http://git-wip-us.apache.org/repos/asf/camel/blob/3e1994db/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsEndpointConnectionSettingsTest.java ---------------------------------------------------------------------- diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsEndpointConnectionSettingsTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsEndpointConnectionSettingsTest.java index 25045b1..56c32a8 100644 --- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsEndpointConnectionSettingsTest.java +++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsEndpointConnectionSettingsTest.java @@ -21,7 +21,6 @@ import java.util.Random; import org.apache.activemq.ActiveMQConnectionFactory; import org.apache.camel.CamelContext; import org.apache.camel.Endpoint; -import org.apache.camel.component.sjms.SjmsEndpoint; import org.apache.camel.component.sjms.jms.ConnectionFactoryResource; import org.apache.camel.component.sjms.jms.ConnectionResource; import org.apache.camel.impl.DefaultCamelContext; @@ -30,8 +29,8 @@ import org.apache.camel.test.junit4.CamelTestSupport; import org.junit.Test; public class SjmsEndpointConnectionSettingsTest extends CamelTestSupport { - private static final ActiveMQConnectionFactory connectionFactory = new ActiveMQConnectionFactory("vm://broker?broker.persistent=false&broker.useJmx=false"); - private static final ConnectionResource connectionResource = new ConnectionFactoryResource(2, connectionFactory); + private final ActiveMQConnectionFactory connectionFactory = new ActiveMQConnectionFactory("vm://broker?broker.persistent=false&broker.useJmx=false"); + private final ConnectionResource connectionResource = new ConnectionFactoryResource(2, connectionFactory); @Test public void testConnectionFactory() {
