[jboss-cvs] JBossAS SVN: r91230 - trunk/connector/src/main/org/jboss/resource/adapter/jms/inflow.

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

Author: jesper.pedersen
Date: 2009-07-14 11:37:22 -0400 (Tue, 14 Jul 2009)
New Revision: 91230

Modified:
   trunk/connector/src/main/org/jboss/resource/adapter/jms/inflow/JmsServerSession.java
Log:
[JBAS-7084] Add support for a traditional XA strategy in the JMS resource adapter

Modified: trunk/connector/src/main/org/jboss/resource/adapter/jms/inflow/JmsServerSession.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/adapter/jms/inflow/JmsServerSession.java	2009-07-14 15:36:34 UTC (rev 91229)
+++ trunk/connector/src/main/org/jboss/resource/adapter/jms/inflow/JmsServerSession.java	2009-07-14 15:37:22 UTC (rev 91230)
@@ -167,7 +167,8 @@
    {
       try
       {
-         endpoint.beforeDelivery(JmsActivation.ONMESSAGE);
+         if (!(txnStrategy != null && txnStrategy instanceof TraditionalXATransactionDemarcationStrategy))
+            endpoint.beforeDelivery(JmsActivation.ONMESSAGE);
 
          try
          {
@@ -179,7 +180,8 @@
             }
          } finally
          {
-            endpoint.afterDelivery();
+            if (!(txnStrategy != null && txnStrategy instanceof TraditionalXATransactionDemarcationStrategy))
+               endpoint.afterDelivery();
 
             if (dlqHandler != null)
                dlqHandler.messageDelivered(message);