You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by da...@apache.org on 2007/04/11 22:16:06 UTC

svn commit: r527645 - /incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/JndiEncInfoBuilder.java

Author: dain
Date: Wed Apr 11 13:16:06 2007
New Revision: 527645

URL: http://svn.apache.org/viewvc?view=rev&rev=527645
Log:
Appclients can't have local ejb refs

Modified:
    incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/JndiEncInfoBuilder.java

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/JndiEncInfoBuilder.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/JndiEncInfoBuilder.java?view=diff&rev=527645&r1=527644&r2=527645
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/JndiEncInfoBuilder.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/JndiEncInfoBuilder.java Wed Apr 11 13:16:06 2007
@@ -48,6 +48,7 @@
 import org.apache.openejb.jee.ServiceRef;
 import org.apache.openejb.jee.MessageDestinationRef;
 import org.apache.openejb.jee.EnterpriseBean;
+import org.apache.openejb.jee.ApplicationClient;
 import org.apache.openejb.jee.oejb3.EjbDeployment;
 import org.apache.openejb.jee.oejb3.ResourceLink;
 import org.apache.openejb.jee.oejb3.EjbLink;
@@ -299,7 +300,7 @@
             }
 
             if (otherBean != null) {
-                if (interfce.equals(otherBean.businessRemote)) {
+                if (interfce.equals(otherBean.businessRemote) || jndiConsumer instanceof ApplicationClient) {
                     ejb.setRefType(EjbRef.Type.REMOTE);
                 } else {
                     ejb.setRefType(EjbRef.Type.LOCAL);
@@ -307,7 +308,7 @@
                     jndiConsumer.getEjbLocalRef().add(new EjbLocalRef(ejb));
                 }
             } else {
-                if (byInterfaces.get("r=" + ejb.getRemote() + ":" + ejb.getHome()) != null) {
+                if (byInterfaces.get("r=" + ejb.getRemote() + ":" + ejb.getHome()) != null || jndiConsumer instanceof ApplicationClient) {
                     ejb.setRefType(EjbRef.Type.REMOTE);
                 } else {
                     ejb.setRefType(EjbRef.Type.LOCAL);