geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From genspr...@apache.org
Subject svn commit: r1147468 - /geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbRefBuilder.java
Date Sat, 16 Jul 2011 17:53:17 GMT
Author: genspring
Date: Sat Jul 16 17:53:17 2011
New Revision: 1147468

URL: http://svn.apache.org/viewvc?rev=1147468&view=rev
Log:
GERONIMO-5050 earData is null when there's no ejb in ear but there's ejb ref pointing to ejbs
defined in other application. We should handle this situation but not just skip.

Modified:
    geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbRefBuilder.java

Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbRefBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbRefBuilder.java?rev=1147468&r1=1147467&r2=1147468&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbRefBuilder.java
(original)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbRefBuilder.java
Sat Jul 16 17:53:17 2011
@@ -136,12 +136,12 @@ public class EjbRefBuilder extends Abstr
         Set<String> ejbLocalRefNames = new HashSet<String>();
         try {
             EjbModuleBuilder.EarData earData = EjbModuleBuilder.EarData.KEY.get(module.getRootEarContext().getGeneralData());
-            if (earData == null) {
-                //no ejbs anywhere?
-                return;
-            }
 
-            AppInfo appInfo = earData.getAppInfo();
+            AppInfo appInfo = new AppInfo();
+            
+            if (earData != null) {
+               appInfo = earData.getAppInfo();
+            }
 
             JndiEncInfoBuilder jndiEncInfoBuilder = new JndiEncInfoBuilder(appInfo);
             JndiEncInfo moduleJndi = new JndiEncInfo();



Mime
View raw message