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 2008/03/07 04:00:25 UTC
svn commit: r634507 -
/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/JndiEncInfoBuilder.java
Author: dblevins
Date: Thu Mar 6 19:00:21 2008
New Revision: 634507
URL: http://svn.apache.org/viewvc?rev=634507&view=rev
Log:
check for externalReference wound up false if the scope was null, should be true in those cases.
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/JndiEncInfoBuilder.java
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/JndiEncInfoBuilder.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/JndiEncInfoBuilder.java?rev=634507&r1=634506&r2=634507&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/JndiEncInfoBuilder.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/JndiEncInfoBuilder.java Thu Mar 6 19:00:21 2008
@@ -16,6 +16,8 @@
*/
package org.apache.openejb.config;
+import static org.apache.openejb.assembler.classic.EjbResolver.Scope.EJBJAR;
+import static org.apache.openejb.assembler.classic.EjbResolver.Scope.EAR;
import org.apache.openejb.OpenEJBException;
import org.apache.openejb.loader.SystemInstance;
import org.apache.openejb.assembler.classic.AppInfo;
@@ -83,13 +85,13 @@
// EAR-scoped EJB Resolver
- earResolver = new EjbResolver(globalResolver, EjbResolver.Scope.EAR, appInfo.ejbJars);
+ earResolver = new EjbResolver(globalResolver, EAR, appInfo.ejbJars);
// EJBJAR-scoped EJB Resolver(s)
for (EjbJarInfo ejbJarInfo : appInfo.ejbJars) {
- EjbResolver ejbJarResolver = new EjbResolver(earResolver, EjbResolver.Scope.EJBJAR, ejbJarInfo);
+ EjbResolver ejbJarResolver = new EjbResolver(earResolver, EJBJAR, ejbJarInfo);
ejbJarResolvers.put(ejbJarInfo.moduleId, ejbJarResolver);
}
@@ -180,9 +182,10 @@
}
continue;
}
-
- info.externalReference = ejbResolver.getScope(deploymentId) == EjbResolver.Scope.GLOBAL;
+ EjbResolver.Scope scope = ejbResolver.getScope(deploymentId);
+
+ info.externalReference = (scope != EAR && scope != EJBJAR);
if (ref.getRefType() == EjbReference.Type.UNKNOWN) {
EnterpriseBeanInfo otherBean = ejbResolver.getEnterpriseBeanInfo(deploymentId);