activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject activemq git commit: Fixes CAMEL-10226: camel-jms ignores connection pool settings in spring-boot deployment.
Date Tue, 09 Aug 2016 16:23:57 GMT
Repository: activemq
Updated Branches:
  refs/heads/master 4800a7a1a -> 50dc5864f


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/50dc5864
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/50dc5864
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/50dc5864

Branch: refs/heads/master
Commit: 50dc5864fd61ba528c20c7a2a8502204a7a32f6d
Parents: 4800a7a
Author: Hiram Chirino <hiram@hiramchirino.com>
Authored: Tue Aug 9 11:41:22 2016 -0400
Committer: Hiram Chirino <hiram@hiramchirino.com>
Committed: Tue Aug 9 11:56:01 2016 -0400

----------------------------------------------------------------------
 .../apache/activemq/camel/component/ActiveMQComponent.java  | 9 +++++++++
 1 file changed, 9 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/50dc5864/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 0ed82bf..27c38c9 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
@@ -297,4 +297,13 @@ public class ActiveMQComponent extends JmsComponent implements EndpointCompleter
         }
         return answer;
     }
+
+    /**
+     * We don't want to ever auto-wire the connection factory from the spring app context.
+     * @return false
+     */
+    public boolean getAllowAutoWiredConnectionFactory() {
+        return false;
+    }
+
 }


Mime
View raw message