[jboss-cvs] JBossAS SVN: r67204 - trunk/iiop/src/main/org/jboss/proxy/ejb.

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

Author: alex.loubyansky at jboss.com
Date: 2007-11-16 16:33:07 -0500 (Fri, 16 Nov 2007)
New Revision: 67204

Modified:
   trunk/iiop/src/main/org/jboss/proxy/ejb/EjbHomeCorbaServant.java
Log:
JBCTS-660 setup ENC before invocation

Modified: trunk/iiop/src/main/org/jboss/proxy/ejb/EjbHomeCorbaServant.java
===================================================================
--- trunk/iiop/src/main/org/jboss/proxy/ejb/EjbHomeCorbaServant.java	2007-11-16 21:27:08 UTC (rev 67203)
+++ trunk/iiop/src/main/org/jboss/proxy/ejb/EjbHomeCorbaServant.java	2007-11-16 21:33:07 UTC (rev 67204)
@@ -50,6 +50,7 @@
 import org.jboss.invocation.iiop.ServantWithMBeanServer;
 import org.jboss.logging.Logger;
 import org.jboss.security.SimplePrincipal;
+import org.jboss.naming.ENCFactory;
 
 /**
  * CORBA servant class for an <code>EJBHome</code>. An instance of this class 
@@ -214,6 +215,9 @@
       
       ClassLoader oldCl = Thread.currentThread().getContextClassLoader();
       Thread.currentThread().setContextClassLoader(containerClassLoader);
+
+      // make java:comp work
+      ENCFactory.pushContextId(containerName);
       
       try {
          
@@ -313,6 +317,8 @@
          return out;
       }
       finally {
+         // pop ENC context
+         ENCFactory.popContextId();
          Thread.currentThread().setContextClassLoader(oldCl);
       }
    }