You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by ri...@apache.org on 2007/03/30 19:02:21 UTC

svn commit: r524177 - in /incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm: EjbHomeProxyHandler.java EjbObjectProxyHandler.java

Author: rickmcguire
Date: Fri Mar 30 10:02:20 2007
New Revision: 524177

URL: http://svn.apache.org/viewvc?view=rev&rev=524177
Log:
OPENEJB-553 EjbObjectProxyHandler and EjbHomeProxyHandler serialization using wrong server context.


Modified:
    incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/EjbHomeProxyHandler.java
    incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/EjbObjectProxyHandler.java

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/EjbHomeProxyHandler.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/EjbHomeProxyHandler.java?view=diff&rev=524177&r1=524176&r2=524177
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/EjbHomeProxyHandler.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/EjbHomeProxyHandler.java Fri Mar 30 10:02:20 2007
@@ -29,6 +29,7 @@
 import org.apache.openejb.RpcContainer;
 import org.apache.openejb.InterfaceType;
 import org.apache.openejb.DeploymentInfo;
+import org.apache.openejb.core.ServerFederation;
 import org.apache.openejb.loader.SystemInstance;
 import org.apache.openejb.spi.ApplicationServer;
 import org.apache.openejb.util.proxy.ProxyManager;
@@ -265,7 +266,7 @@
             * we allow the application server to handle it.
             */
         } else {
-            ApplicationServer applicationServer = SystemInstance.get().getComponent(ApplicationServer.class);
+            ApplicationServer applicationServer = ServerFederation.getApplicationServer();
             return applicationServer.getEJBHome(this.getProxyInfo());
         }
     }

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/EjbObjectProxyHandler.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/EjbObjectProxyHandler.java?view=diff&rev=524177&r1=524176&r2=524177
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/EjbObjectProxyHandler.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/EjbObjectProxyHandler.java Fri Mar 30 10:02:20 2007
@@ -22,6 +22,7 @@
 
 import org.apache.openejb.RpcContainer;
 import org.apache.openejb.InterfaceType;
+import org.apache.openejb.core.ServerFederation;
 import org.apache.openejb.util.Logger;
 import org.apache.openejb.loader.SystemInstance;
 import org.apache.openejb.spi.ApplicationServer;
@@ -174,7 +175,7 @@
             * we allow the application server to handle it.
             */
         } else {
-            ApplicationServer applicationServer = SystemInstance.get().getComponent(ApplicationServer.class);
+            ApplicationServer applicationServer = ServerFederation.getApplicationServer();
             return applicationServer.getEJBObject(this.getProxyInfo());
         }
     }