activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject [1/2] activemq git commit: Fixes CAMEL-10226: camel-jms ignores connection pool settings in spring-boot deployment.
Date Wed, 10 Aug 2016 08:50:50 GMT
Repository: activemq
Updated Branches:
  refs/heads/activemq-5.14.x a35371d88 -> 85a2d975a


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

Branch: refs/heads/activemq-5.14.x
Commit: 7216322ef982214e5b30033d0e4650907e04518b
Parents: a35371d
Author: Hiram Chirino <hiram@hiramchirino.com>
Authored: Tue Aug 9 11:41:22 2016 -0400
Committer: Claus Ibsen <claus.ibsen@gmail.com>
Committed: Wed Aug 10 10:50:30 2016 +0200

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


http://git-wip-us.apache.org/repos/asf/activemq/blob/7216322e/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