activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject activemq git commit: Fixes CAMEL-10226: camel-jms ignores connection pool settings in spring-boot deployment.
Date Wed, 10 Aug 2016 08:47:29 GMT
Repository: activemq
Updated Branches:
  refs/heads/master 50dc5864f -> 4437393aa


Fixes CAMEL-10226: camel-jms ignores connection pool settings in spring-boot deployment.


Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/4437393a
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/4437393a
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/4437393a

Branch: refs/heads/master
Commit: 4437393aa1a981a182142c255f76ae7cc50af183
Parents: 50dc586
Author: Claus Ibsen <claus.ibsen@gmail.com>
Authored: Wed Aug 10 10:47:18 2016 +0200
Committer: Claus Ibsen <claus.ibsen@gmail.com>
Committed: Wed Aug 10 10:47:18 2016 +0200

----------------------------------------------------------------------
 .../org/apache/activemq/camel/component/ActiveMQComponent.java  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/4437393a/activemq-camel/src/main/java/org/apache/activemq/camel/component/ActiveMQComponent.java
----------------------------------------------------------------------
diff --git a/activemq-camel/src/main/java/org/apache/activemq/camel/component/ActiveMQComponent.java
b/activemq-camel/src/main/java/org/apache/activemq/camel/component/ActiveMQComponent.java
index 27c38c9..d1328f2 100644
--- a/activemq-camel/src/main/java/org/apache/activemq/camel/component/ActiveMQComponent.java
+++ b/activemq-camel/src/main/java/org/apache/activemq/camel/component/ActiveMQComponent.java
@@ -299,10 +299,11 @@ public class ActiveMQComponent extends JmsComponent implements EndpointCompleter
     }
 
     /**
-     * We don't want to ever auto-wire the connection factory from the spring app context.
+     * We don't want to ever auto-wire the connection factory from the spring app context
(requires Camel 2.18 onwards)
+     *
      * @return false
      */
-    public boolean getAllowAutoWiredConnectionFactory() {
+    public boolean isAllowAutoWiredConnectionFactory() {
         return false;
     }
 


Mime
View raw message