You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2014/03/01 23:55:52 UTC
svn commit: r1573236 - in /tomee/tomee/trunk/container/openejb-core/src:
main/java/org/apache/openejb/core/ivm/
test/java/org/apache/openejb/util/proxy/
Author: dblevins
Date: Sat Mar 1 22:55:52 2014
New Revision: 1573236
URL: http://svn.apache.org/r1573236
Log:
svn merge -r 1573232:1573233 https://svn.apache.org/repos/asf/tomee/tomee/branches/tomee-1.5.x
http://svn.apache.org/viewvc?view=revision&revision=1573233
------------------------------------------------------------------------
r1573233 | dblevins | 2014-03-01 14:12:29 -0800 (Sat, 01 Mar 2014) | 2 lines
OPENEJB-2080: EJB @LocalBean reference serialization issue
------------------------------------------------------------------------
Added:
tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/util/proxy/LocalReferenceSerializationTest.java
- copied unchanged from r1573233, tomee/tomee/branches/tomee-1.5.x/container/openejb-core/src/test/java/org/apache/openejb/util/proxy/LocalReferenceSerializationTest.java
Modified:
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/EjbHomeProxyHandler.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/EjbObjectProxyHandler.java
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/EjbHomeProxyHandler.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/EjbHomeProxyHandler.java?rev=1573236&r1=1573235&r2=1573236&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/EjbHomeProxyHandler.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/EjbHomeProxyHandler.java Sat Mar 1 22:55:52 2014
@@ -447,6 +447,9 @@ public abstract class EjbHomeProxyHandle
* If the proxy is serialized outside the core container system,
* we allow the application server to handle it.
*/
+ } else if (!interfaceType.isRemote()) {
+ return proxy;
+
} else {
final ApplicationServer applicationServer = ServerFederation.getApplicationServer();
return applicationServer.getEJBHome(this.getProxyInfo());
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/EjbObjectProxyHandler.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/EjbObjectProxyHandler.java?rev=1573236&r1=1573235&r2=1573236&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/EjbObjectProxyHandler.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/EjbObjectProxyHandler.java Sat Mar 1 22:55:52 2014
@@ -220,6 +220,10 @@ public abstract class EjbObjectProxyHand
* If the proxy is serialized outside the core container system,
* we allow the application server to handle it.
*/
+ } else if (!interfaceType.isRemote()) {
+
+ return proxy;
+
} else {
final ApplicationServer applicationServer = ServerFederation.getApplicationServer();
if (interfaceType.isBusiness()) {