[jboss-cvs] JBossAS SVN: r86875 - branches/JBPAPP_4_2_0_GA_CP/ejb3/src/main/org/jboss/ejb3/mdb/inflow.

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

Author: jhowell at redhat.com
Date: 2009-04-06 16:12:22 -0400 (Mon, 06 Apr 2009)
New Revision: 86875

Modified:
   branches/JBPAPP_4_2_0_GA_CP/ejb3/src/main/org/jboss/ejb3/mdb/inflow/MessageInflowLocalProxy.java
Log:
[JBPAPP-1863] Set the transaction to null in the finally block to make sure that the inflow proxy doesn't hold on to the transaction.

Modified: branches/JBPAPP_4_2_0_GA_CP/ejb3/src/main/org/jboss/ejb3/mdb/inflow/MessageInflowLocalProxy.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/src/main/org/jboss/ejb3/mdb/inflow/MessageInflowLocalProxy.java	2009-04-06 19:55:00 UTC (rev 86874)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/src/main/org/jboss/ejb3/mdb/inflow/MessageInflowLocalProxy.java	2009-04-06 20:12:22 UTC (rev 86875)
@@ -157,7 +157,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 +186,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);
@@ -450,6 +450,9 @@
       }
       finally
       {
+         // EJBTHREE-1142: We're done with the transaction
+         transaction = null;
+         
          // Resume any suspended transaction
          if (currentTx != null)
          {