[jboss-cvs] JBoss Messaging SVN: r2602 - trunk/src/main/org/jboss/jms/client/container.

[jboss-cvs-commits at lists.jboss.org]

Author: clebert.suconic at jboss.com
Date: 2007-04-24 23:53:59 -0400 (Tue, 24 Apr 2007)
New Revision: 2602

Modified:
   trunk/src/main/org/jboss/jms/client/container/SessionAspect.java
Log:
http://jira.jboss.org/jira/browse/JBMESSAGING-946 - Proposed fix

Modified: trunk/src/main/org/jboss/jms/client/container/SessionAspect.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/container/SessionAspect.java	2007-04-24 11:03:47 UTC (rev 2601)
+++ trunk/src/main/org/jboss/jms/client/container/SessionAspect.java	2007-04-25 03:53:59 UTC (rev 2602)
@@ -598,7 +598,7 @@
       SessionState state = getState(invocation);
       Object txID = state.getCurrentTxId();
 
-      if (txID != null)
+      if ((!state.isXA() && state.isTransacted()) || (state.isXA() && !(txID instanceof LocalTx)))
       {
          // the session is non-XA and transacted, or XA and enrolled in a global transaction, so
          // we add the message to a transaction instead of sending it now. An XA session that has