You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ta...@apache.org on 2015/03/05 23:43:18 UTC
activemq git commit: https://issues.apache.org/jira/browse/AMQ-5563
Repository: activemq
Updated Branches:
refs/heads/master aea771faf -> 3ef8f492a
https://issues.apache.org/jira/browse/AMQ-5563
Added fix to update the documentation to reflect correct defaults.
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/3ef8f492
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/3ef8f492
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/3ef8f492
Branch: refs/heads/master
Commit: 3ef8f492a7cb9c056ac1883ccb069e9559fc6b22
Parents: aea771f
Author: Timothy Bish <ta...@gmail.com>
Authored: Thu Mar 5 16:04:12 2015 -0500
Committer: Timothy Bish <ta...@gmail.com>
Committed: Thu Mar 5 16:04:12 2015 -0500
----------------------------------------------------------------------
.../activemq/camel/component/ActiveMQConfiguration.java | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/3ef8f492/activemq-camel/src/main/java/org/apache/activemq/camel/component/ActiveMQConfiguration.java
----------------------------------------------------------------------
diff --git a/activemq-camel/src/main/java/org/apache/activemq/camel/component/ActiveMQConfiguration.java b/activemq-camel/src/main/java/org/apache/activemq/camel/component/ActiveMQConfiguration.java
index 547f3c3..5dba295 100644
--- a/activemq-camel/src/main/java/org/apache/activemq/camel/component/ActiveMQConfiguration.java
+++ b/activemq-camel/src/main/java/org/apache/activemq/camel/component/ActiveMQConfiguration.java
@@ -23,13 +23,13 @@ import javax.jms.ConnectionFactory;
import org.apache.activemq.Service;
import org.apache.activemq.spring.ActiveMQConnectionFactory;
import org.apache.camel.component.jms.JmsConfiguration;
-import org.springframework.jms.connection.SingleConnectionFactory;
import org.springframework.jms.connection.JmsTransactionManager;
+import org.springframework.jms.connection.SingleConnectionFactory;
import org.springframework.jms.core.JmsTemplate;
import org.springframework.transaction.PlatformTransactionManager;
/**
- *
+ *
*/
public class ActiveMQConfiguration extends JmsConfiguration {
private String brokerURL = ActiveMQConnectionFactory.DEFAULT_BROKER_URL;
@@ -91,7 +91,7 @@ public class ActiveMQConfiguration extends JmsConfiguration {
* than the default with the Spring {@link JmsTemplate} which will create a new connection, session, producer
* for each message then close them all down again.
* <p/>
- * The default value is true so that a single connection is used by default.
+ * The default value is false and a pooled connection is used by default.
*
* @param useSingleConnection
*/
@@ -109,7 +109,7 @@ public class ActiveMQConfiguration extends JmsConfiguration {
* than the default with the Spring {@link JmsTemplate} which will create a new connection, session, producer
* for each message then close them all down again.
* <p/>
- * The default value is false by default as it requires an extra dependency on commons-pool.
+ * The default value is true. Note that this requires an extra dependency on commons-pool.
*/
public void setUsePooledConnection(boolean usePooledConnection) {
this.usePooledConnection = usePooledConnection;
@@ -118,6 +118,7 @@ public class ActiveMQConfiguration extends JmsConfiguration {
/**
* Factory method to create a default transaction manager if one is not specified
*/
+ @Override
protected PlatformTransactionManager createTransactionManager() {
JmsTransactionManager answer = new JmsTransactionManager(getConnectionFactory());
answer.afterPropertiesSet();