Author: jstrachan Date: Mon Apr 7 07:23:14 2008 New Revision: 645538 URL: http://svn.apache.org/viewvc?rev=645538&view=rev Log: use getter rather than field to allow customization by derived classes Modified: activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java Modified: activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java?rev=645538&r1=645537&r2=645538&view=diff ============================================================================== --- activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java (original) +++ activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java Mon Apr 7 07:23:14 2008 @@ -718,8 +718,9 @@ if (taskExecutor != null) { listenerContainer.setTaskExecutor(taskExecutor); } - if (transactionManager != null) { - listenerContainer.setTransactionManager(transactionManager); + PlatformTransactionManager tm = getTransactionManager(); + if (tm != null) { + listenerContainer.setTransactionManager(tm); } else if (transacted) { throw new IllegalArgumentException( "Property transacted is enabled but a transactionManager was not injected!");