You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2016/05/13 06:12:07 UTC
camel git commit: Fixed CS. This closes #982. This closes #983.
Repository: camel
Updated Branches:
refs/heads/master 7dddd9a61 -> af9977100
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/af997710
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/af997710
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/af997710
Branch: refs/heads/master
Commit: af9977100c63f12bff3c19dc6547cdbc355f4439
Parents: 7dddd9a
Author: Claus Ibsen <da...@apache.org>
Authored: Fri May 13 08:12:00 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri May 13 08:12:00 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/af997710/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/af997710/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() {