[jboss-cvs] JBossAS SVN: r66100 - branches/Branch_4_2/iiop/src/main/org/jboss/proxy/ejb.

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

Author: sguilhen at redhat.com
Date: 2007-10-12 15:56:12 -0400 (Fri, 12 Oct 2007)
New Revision: 66100

Modified:
   branches/Branch_4_2/iiop/src/main/org/jboss/proxy/ejb/EjbObjectCorbaServant.java
   branches/Branch_4_2/iiop/src/main/org/jboss/proxy/ejb/IORFactory.java
Log:
Added a narrow operation before creating the HandleImplIIOP and HomeHandleImplIIOP classes, as a fix for issue JBCTS-660.

Modified: branches/Branch_4_2/iiop/src/main/org/jboss/proxy/ejb/EjbObjectCorbaServant.java
===================================================================
--- branches/Branch_4_2/iiop/src/main/org/jboss/proxy/ejb/EjbObjectCorbaServant.java	2007-10-12 19:53:29 UTC (rev 66099)
+++ branches/Branch_4_2/iiop/src/main/org/jboss/proxy/ejb/EjbObjectCorbaServant.java	2007-10-12 19:56:12 UTC (rev 66100)
@@ -235,7 +235,9 @@
 
             if (opName.equals("_get_handle"))
             {
-               retVal = new HandleImplIIOP(_this_object());
+               javax.ejb.EJBObject o =
+                  (javax.ejb.EJBObject)javax.rmi.PortableRemoteObject.narrow(_this_object(), javax.ejb.EJBObject.class);
+               retVal = new HandleImplIIOP(o); 
             }
             else
             {

Modified: branches/Branch_4_2/iiop/src/main/org/jboss/proxy/ejb/IORFactory.java
===================================================================
--- branches/Branch_4_2/iiop/src/main/org/jboss/proxy/ejb/IORFactory.java	2007-10-12 19:53:29 UTC (rev 66099)
+++ branches/Branch_4_2/iiop/src/main/org/jboss/proxy/ejb/IORFactory.java	2007-10-12 19:56:12 UTC (rev 66100)
@@ -489,9 +489,9 @@
 
       org.omg.CORBA.Object corbaRef =
          homeReferenceFactory.createReference(homeRepositoryIds[0]);
+      ejbHome = (EJBHome)PortableRemoteObject.narrow(corbaRef, EJBHome.class);
       ((EjbHomeCorbaServant)homeServant).setHomeHandle(
-                                             new HomeHandleImplIIOP(corbaRef));
-      ejbHome = (EJBHome)PortableRemoteObject.narrow(corbaRef, EJBHome.class);
+                                             new HomeHandleImplIIOP(ejbHome));
 
       // Initialize beanPOA and create metadata depending on the kind of bean
       if (container.getBeanMetaData() instanceof EntityMetaData) {