svn commit: r477657 - in /incubator/openejb/trunk/openejb2/modules/openejb-corba/src/main/java/org/apache/openejb/corba: AdapterWrapper.java TSSBean.java

[ri...@apache.org]

Author: rickmcguire
Date: Tue Nov 21 04:54:49 2006
New Revision: 477657

URL: http://svn.apache.org/viewvc?view=rev&rev=477657
Log:
OPENEJB-340 Remove obsolete NamingContext from AdapterWrapper


Modified:
    incubator/openejb/trunk/openejb2/modules/openejb-corba/src/main/java/org/apache/openejb/corba/AdapterWrapper.java
    incubator/openejb/trunk/openejb2/modules/openejb-corba/src/main/java/org/apache/openejb/corba/TSSBean.java

Modified: incubator/openejb/trunk/openejb2/modules/openejb-corba/src/main/java/org/apache/openejb/corba/AdapterWrapper.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-corba/src/main/java/org/apache/openejb/corba/AdapterWrapper.java?view=diff&rev=477657&r1=477656&r2=477657
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-corba/src/main/java/org/apache/openejb/corba/AdapterWrapper.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-corba/src/main/java/org/apache/openejb/corba/AdapterWrapper.java Tue Nov 21 04:54:49 2006
@@ -21,7 +21,6 @@
 
 import org.omg.CORBA.ORB;
 import org.omg.CORBA.Policy;
-import org.omg.CosNaming.NamingContextExt;
 import org.omg.PortableServer.POA;
 import org.apache.openejb.EJBComponentType;
 import org.apache.openejb.EjbDeployment;
@@ -40,7 +39,7 @@
 
     }
 
-    public void start(ORB orb, POA poa, NamingContextExt initialContext, Policy securityPolicy) throws CORBAException {
+    public void start(ORB orb, POA poa, Policy securityPolicy) throws CORBAException {
         switch (tssLink.getProxyInfo().getComponentType()) {
             case EJBComponentType.STATELESS:
                 generator = new AdapterStateless(tssLink, orb, poa, securityPolicy);

Modified: incubator/openejb/trunk/openejb2/modules/openejb-corba/src/main/java/org/apache/openejb/corba/TSSBean.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-corba/src/main/java/org/apache/openejb/corba/TSSBean.java?view=diff&rev=477657&r1=477656&r2=477657
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-corba/src/main/java/org/apache/openejb/corba/TSSBean.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-corba/src/main/java/org/apache/openejb/corba/TSSBean.java Tue Nov 21 04:54:49 2006
@@ -126,6 +126,8 @@
             localPOA.the_POAManager().activate();
 
             org.omg.CORBA.Object obj = server.getORB().resolve_initial_references("NameService");
+            // NB:  This is initial context is never used by the TSSBean, but we request it here
+            // to verify that the server ORB is correctly configured and our target server is accessible.
             initialContext = NamingContextExtHelper.narrow(obj);
         } finally {
             Thread.currentThread().setContextClassLoader(savedLoader);
@@ -172,7 +174,7 @@
     public void registerContainer(TSSLink tssLink) throws CORBAException {
         AdapterWrapper adapterWrapper = new AdapterWrapper(tssLink);
 
-        adapterWrapper.start(server.getORB(), localPOA, initialContext, securityPolicy);
+        adapterWrapper.start(server.getORB(), localPOA, securityPolicy);
         adapters.put(tssLink.getContainerId(), adapterWrapper);
 
         log.debug(POAName + " - Linked container " + tssLink.getContainerId());