You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by bv...@apache.org on 2012/05/29 19:36:38 UTC

svn commit: r1343869 - in /camel/trunk/components/camel-jms/src: main/java/org/apache/camel/component/jms/JmsConfiguration.java test/java/org/apache/camel/component/jms/JmsEndpointConfigurationTest.java

Author: bvahdat
Date: Tue May 29 17:36:38 2012
New Revision: 1343869

URL: http://svn.apache.org/viewvc?rev=1343869&view=rev
Log:
CAMEL-5055: Reverted the unintended removal of the call to 'container.setSessionTransacted(transacted)'.

Modified:
    camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
    camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsEndpointConfigurationTest.java

Modified: camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java?rev=1343869&r1=1343868&r2=1343869&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java (original)
+++ camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java Tue May 29 17:36:38 2012
@@ -902,6 +902,7 @@ public class JmsConfiguration implements
 
         container.setAcceptMessagesWhileStopping(acceptMessagesWhileStopping);
         container.setExposeListenerSession(exposeListenerSession);
+        container.setSessionTransacted(transacted);
         if (transacted) {
             container.setSessionAcknowledgeMode(Session.SESSION_TRANSACTED);
         } else {

Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsEndpointConfigurationTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsEndpointConfigurationTest.java?rev=1343869&r1=1343868&r2=1343869&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsEndpointConfigurationTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsEndpointConfigurationTest.java Tue May 29 17:36:38 2012
@@ -211,7 +211,7 @@ public class JmsEndpointConfigurationTes
 
         endpoint = resolveMandatoryEndpoint("jms:queue:Foo?transacted=true", JmsEndpoint.class);
         container = endpoint.createConsumer(dummyProcessor).getListenerContainer();
-        assertFalse("The JMS sessions will be transactional!", container.isSessionTransacted());
+        assertTrue("The JMS sessions will not be transactional!", container.isSessionTransacted());
         assertTrue("The transactionManager doesn't get lazily generated!", endpoint.isLazyCreateTransactionManager());
         assertNotNull("The endpoint has no injected TransactionManager!", endpoint.getTransactionManager());
     }