You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2014/08/14 21:14:32 UTC

svn commit: r1618023 - /tomee/tomee/trunk/server/openejb-client/src/main/java/org/apache/openejb/client/EJBObjectHandler.java

Author: rmannibucau
Date: Thu Aug 14 19:14:32 2014
New Revision: 1618023

URL: http://svn.apache.org/r1618023
Log:
OPENEJB-2100 correct reset of openejb classloader in opeenjb client, thanks Thirsten Meinl for the patch

Modified:
    tomee/tomee/trunk/server/openejb-client/src/main/java/org/apache/openejb/client/EJBObjectHandler.java

Modified: tomee/tomee/trunk/server/openejb-client/src/main/java/org/apache/openejb/client/EJBObjectHandler.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-client/src/main/java/org/apache/openejb/client/EJBObjectHandler.java?rev=1618023&r1=1618022&r2=1618023&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-client/src/main/java/org/apache/openejb/client/EJBObjectHandler.java (original)
+++ tomee/tomee/trunk/server/openejb-client/src/main/java/org/apache/openejb/client/EJBObjectHandler.java Thu Aug 14 19:14:32 2014
@@ -138,9 +138,12 @@ public abstract class EJBObjectHandler e
             if (!parent) {
                 Thread.currentThread().setContextClassLoader(getClass().getClassLoader());
             }
-            ejbObject = (EJBObjectProxy) ProxyManager.newProxyInstance(interfaces.toArray(new Class[interfaces.size()]), this);
-            if (!parent) {
-                Thread.currentThread().setContextClassLoader(getClass().getClassLoader());
+            try {
+                ejbObject = (EJBObjectProxy) ProxyManager.newProxyInstance(interfaces.toArray(new Class[interfaces.size()]), this);
+            } finally {
+                if (!parent) {
+                    Thread.currentThread().setContextClassLoader(oldCl);
+                }
             }
         } catch (IllegalAccessException e) {