You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by ga...@apache.org on 2010/08/13 16:50:10 UTC
svn commit: r985220 -
/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/JndiEncInfoBuilder.java
Author: gawor
Date: Fri Aug 13 14:50:10 2010
New Revision: 985220
URL: http://svn.apache.org/viewvc?rev=985220&view=rev
Log:
add EjbRef into the right namespace bucket
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=985220&r1=985219&r2=985220&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 Fri Aug 13 14:50:10 2010
@@ -160,12 +160,11 @@ public class JndiEncInfoBuilder {
info.targets.addAll(buildInjectionInfos(ref));
info.localbean = isIntefaceLocalBean(moduleId, info.interfaceClassName);
-
if (info.location != null) {
if (ref.getRefType() == EjbReference.Type.LOCAL){
- compJndiEnc.ejbLocalReferences.add(toLocal(info));
+ insert(toLocal(info), appInfo.globalJndiEnc.ejbLocalReferences, appInfo.appJndiEnc.ejbLocalReferences, moduleJndiEnc.ejbLocalReferences, compJndiEnc.ejbLocalReferences);
} else {
- compJndiEnc.ejbReferences.add(info);
+ insert(info, appInfo.globalJndiEnc.ejbReferences, appInfo.appJndiEnc.ejbReferences, moduleJndiEnc.ejbReferences, compJndiEnc.ejbReferences);
}
continue;
}