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

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

Author: alex.loubyansky at jboss.com
Date: 2007-10-02 17:54:39 -0400 (Tue, 02 Oct 2007)
New Revision: 65775

Modified:
   trunk/iiop/src/main/org/jboss/proxy/ejb/EjbObjectCorbaServant.java
Log:
JBCTS-660 push and pop the ENC

Modified: trunk/iiop/src/main/org/jboss/proxy/ejb/EjbObjectCorbaServant.java
===================================================================
--- trunk/iiop/src/main/org/jboss/proxy/ejb/EjbObjectCorbaServant.java	2007-10-02 21:51:29 UTC (rev 65774)
+++ trunk/iiop/src/main/org/jboss/proxy/ejb/EjbObjectCorbaServant.java	2007-10-02 21:54:39 UTC (rev 65775)
@@ -52,6 +52,7 @@
 import org.jboss.invocation.iiop.ServantWithMBeanServer;
 import org.jboss.logging.Logger;
 import org.jboss.security.SimplePrincipal;
+import org.jboss.naming.ENCFactory;
 
 
 /**
@@ -242,6 +243,9 @@
             throw new UnknownException(e);
          }
 
+         // make java:comp work
+         ENCFactory.pushContextId(containerName);
+
          org.omg.CORBA_2_3.portable.OutputStream out;
          try
          {
@@ -333,6 +337,8 @@
       }
       finally
       {
+         // pop ENC context
+         ENCFactory.popContextId();
          Thread.currentThread().setContextClassLoader(oldCl);
       }
    }