[jboss-cvs] JBossAS SVN: r67773 - trunk/ejb3/src/main/org/jboss/ejb3/mdb/inflow.

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

Author: wolfc
Date: 2007-12-03 08:48:44 -0500 (Mon, 03 Dec 2007)
New Revision: 67773

Modified:
   trunk/ejb3/src/main/org/jboss/ejb3/mdb/inflow/MessageInflowLocalProxy.java
Log:
EJBTHREE-1142: disassociate transaction after ending it

Modified: trunk/ejb3/src/main/org/jboss/ejb3/mdb/inflow/MessageInflowLocalProxy.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/mdb/inflow/MessageInflowLocalProxy.java	2007-12-03 12:40:08 UTC (rev 67772)
+++ trunk/ejb3/src/main/org/jboss/ejb3/mdb/inflow/MessageInflowLocalProxy.java	2007-12-03 13:48:44 UTC (rev 67773)
@@ -21,8 +21,8 @@
  */
 package org.jboss.ejb3.mdb.inflow;
 
+import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
-import java.lang.reflect.InvocationHandler;
 
 import javax.resource.ResourceException;
 import javax.resource.spi.endpoint.MessageEndpointFactory;
@@ -31,11 +31,10 @@
 import javax.transaction.TransactionManager;
 import javax.transaction.xa.XAResource;
 
+import org.jboss.aop.MethodInfo;
 import org.jboss.aop.joinpoint.Invocation;
 import org.jboss.aop.joinpoint.MethodInvocation;
-import org.jboss.aop.MethodInfo;
 import org.jboss.ejb3.mdb.MessagingContainer;
-import org.jboss.ejb3.mdb.MDB;
 import org.jboss.ejb3.tx.TxUtil;
 import org.jboss.logging.Logger;
 
@@ -157,7 +156,7 @@
       released.set(true);
 
       if (trace)
-         log.trace("MessageEndpoint " + getProxyString(proxy) + " released");
+         log.trace("MessageEndpoint " + getProxyString(proxy) + " release " + Thread.currentThread());
       
       // Tidyup any outstanding delivery
       if (oldClassLoader != null)
@@ -186,7 +185,7 @@
          throw new IllegalStateException("Missing afterDelivery from the previous beforeDelivery for message endpoint " + getProxyString(proxy));
 
       if (trace)
-         log.trace("MessageEndpoint " + getProxyString(proxy) + " released");
+         log.trace("MessageEndpoint " + getProxyString(proxy) + " before");
 
       // Set the classloader
       oldClassLoader = GetTCLAction.getContextClassLoader(inUseThread);
@@ -432,6 +431,9 @@
                   log.trace("MessageEndpoint " + getProxyString(proxy) + " commit");
                tm.commit();
             }
+            
+            // We're done with the transaction
+            transaction = null;
          }
 
          // If we suspended the incoming transaction, resume it