camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject svn commit: r1174759 - in /camel/branches/camel-2.8.x: ./ components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
Date Fri, 23 Sep 2011 13:43:27 GMT
Author: davsclaus
Date: Fri Sep 23 13:43:26 2011
New Revision: 1174759

URL: http://svn.apache.org/viewvc?rev=1174759&view=rev
Log:
Merged revisions 1174745 via svnmerge from 
https://svn.apache.org/repos/asf/camel/trunk

........
  r1174745 | davsclaus | 2011-09-23 15:36:26 +0200 (Fri, 23 Sep 2011) | 1 line
  
  CAMEL-4240: Setting TX manager is possible without having transacted=true. To work with
WebLogic XA. Thanks to Andrey for  the patch.
........

Modified:
    camel/branches/camel-2.8.x/   (props changed)
    camel/branches/camel-2.8.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java

Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 23 13:43:26 2011
@@ -1 +1 @@
-/camel/trunk:1173732,1173958,1174047,1174129,1174245,1174565
+/camel/trunk:1173732,1173958,1174047,1174129,1174245,1174565,1174745

Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: camel/branches/camel-2.8.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java?rev=1174759&r1=1174758&r2=1174759&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
(original)
+++ camel/branches/camel-2.8.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
Fri Sep 23 13:43:26 2011
@@ -958,7 +958,7 @@ public class JmsConfiguration implements
             container.setTaskExecutor(taskExecutor);
         }
         PlatformTransactionManager tm = getTransactionManager();
-        if (tm != null && transacted) {
+        if (tm != null) {
             container.setTransactionManager(tm);
         } else if (transacted) {
             throw new IllegalArgumentException("Property transacted is enabled but a transactionManager
was not injected!");



Mime
View raw message