[camel] branch master updated: camel-jms - minor refactorings

[tsato]

This is an automated email from the ASF dual-hosted git repository.

tsato 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 16c5c35  camel-jms - minor refactorings
16c5c35 is described below

commit 16c5c35e0c4528e6b80f2d08c5eb22ab2da04edd
Author: Tadayoshi Sato <sato.tadayo...@gmail.com>
AuthorDate: Fri Nov 15 18:26:15 2019 +0900

    camel-jms - minor refactorings
---
 .../org/apache/camel/component/jms/JmsComponent.java | 20 ++++++++++----------
 .../org/apache/camel/component/jms/JmsEndpoint.java  |  3 +--
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git 
a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsComponent.java
 
b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsComponent.java
index 99960e1..c73bc73 100644
--- 
a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsComponent.java
+++ 
b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsComponent.java
@@ -100,18 +100,18 @@ public class JmsComponent extends 
HeaderFilterStrategyComponent implements Appli
      * Static builder method
      */
     public static JmsComponent jmsComponentClientAcknowledge(ConnectionFactory 
connectionFactory) {
-        JmsConfiguration template = new JmsConfiguration(connectionFactory);
-        template.setAcknowledgementMode(Session.CLIENT_ACKNOWLEDGE);
-        return jmsComponent(template);
+        JmsConfiguration configuration = new 
JmsConfiguration(connectionFactory);
+        configuration.setAcknowledgementMode(Session.CLIENT_ACKNOWLEDGE);
+        return jmsComponent(configuration);
     }
 
     /**
      * Static builder method
      */
     public static JmsComponent jmsComponentAutoAcknowledge(ConnectionFactory 
connectionFactory) {
-        JmsConfiguration template = new JmsConfiguration(connectionFactory);
-        template.setAcknowledgementMode(Session.AUTO_ACKNOWLEDGE);
-        return jmsComponent(template);
+        JmsConfiguration configuration = new 
JmsConfiguration(connectionFactory);
+        configuration.setAcknowledgementMode(Session.AUTO_ACKNOWLEDGE);
+        return jmsComponent(configuration);
     }
 
     public static JmsComponent jmsComponentTransacted(ConnectionFactory 
connectionFactory) {
@@ -122,10 +122,10 @@ public class JmsComponent extends 
HeaderFilterStrategyComponent implements Appli
 
     public static JmsComponent jmsComponentTransacted(ConnectionFactory 
connectionFactory,
                                                       
PlatformTransactionManager transactionManager) {
-        JmsConfiguration template = new JmsConfiguration(connectionFactory);
-        template.setTransactionManager(transactionManager);
-        template.setTransacted(true);
-        return jmsComponent(template);
+        JmsConfiguration configuration = new 
JmsConfiguration(connectionFactory);
+        configuration.setTransactionManager(transactionManager);
+        configuration.setTransacted(true);
+        return jmsComponent(configuration);
     }
 
     // Properties
diff --git 
a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java
 
b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java
index 06b0509..c7c160d 100644
--- 
a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java
+++ 
b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java
@@ -215,8 +215,7 @@ public class JmsEndpoint extends DefaultEndpoint implements 
AsyncEndpoint, Heade
             if (configuration.getTaskExecutor() instanceof ExecutorService) {
                 consumer.setListenerContainerExecutorService((ExecutorService) 
configuration.getTaskExecutor(), false);
             }
-        } else if ((listenerContainer instanceof 
DefaultJmsMessageListenerContainer && 
configuration.getDefaultTaskExecutorType() == null)
-                || !(listenerContainer instanceof 
DefaultJmsMessageListenerContainer)) {
+        } else if (!(listenerContainer instanceof 
DefaultJmsMessageListenerContainer) || 
configuration.getDefaultTaskExecutorType() == null) {
             // preserve backwards compatibility if an explicit Default 
TaskExecutor Type was not set;
             // otherwise, defer the creation of the TaskExecutor
             // use a cached pool as DefaultMessageListenerContainer will 
throttle pool sizing