svn commit: r681218 - /openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbInstanceFactory.java

[dblevins]

Author: dblevins
Date: Wed Jul 30 15:03:03 2008
New Revision: 681218

URL: http://svn.apache.org/viewvc?rev=681218&view=rev
Log:
Set the ThreadContext to the old context on the exit() method.  It mistakenly 
left the new ThreadContext active by passing it in both the enter() and exit() 
methods.

Modified:
    
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbInstanceFactory.java

Modified: 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbInstanceFactory.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbInstanceFactory.java?rev=681218&r1=681217&r2=681218&view=diff
==============================================================================
--- 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbInstanceFactory.java
 (original)
+++ 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbInstanceFactory.java
 Wed Jul 30 15:03:03 2008
@@ -183,7 +183,7 @@
         objectRecipe.allow(Option.IGNORE_MISSING_PROPERTIES);
 
         ThreadContext callContext = new ThreadContext(deploymentInfo, null, 
Operation.INJECTION);
-        ThreadContext.enter(callContext);
+        ThreadContext oldContext = ThreadContext.enter(callContext);
         try {
             Context ctx = deploymentInfo.getJndiEnc();
             // construct the bean instance
@@ -260,7 +260,7 @@
             MdbInstanceFactory.logger.error(message, e);
             throw new UnavailableException(message, e);
         } finally {
-            ThreadContext.exit(callContext);
+            ThreadContext.exit(oldContext);
         }
     }