You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by da...@apache.org on 2016/08/10 08:50:51 UTC
[2/2] activemq git commit: Fixes CAMEL-10226: camel-jms ignores
connection pool settings in spring-boot deployment.
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/85a2d975
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/85a2d975
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/85a2d975
Branch: refs/heads/activemq-5.14.x
Commit: 85a2d975a3aa026b1021780183d11fda4a67b99e
Parents: 7216322
Author: Claus Ibsen <cl...@gmail.com>
Authored: Wed Aug 10 10:47:18 2016 +0200
Committer: Claus Ibsen <cl...@gmail.com>
Committed: Wed Aug 10 10:50:35 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/85a2d975/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;
}