You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by db...@apache.org on 2007/01/23 23:35:04 UTC

svn commit: r499167 - /geronimo/server/trunk/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java

Author: dblevins
Date: Tue Jan 23 14:35:03 2007
New Revision: 499167

URL: http://svn.apache.org/viewvc?view=rev&rev=499167
Log:
need these references even when they are empty or we can't get our modified tree data back out after configureApplication

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

Modified: geronimo/server/trunk/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java?view=diff&rev=499167&r1=499166&r2=499167
==============================================================================
--- geronimo/server/trunk/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java (original)
+++ geronimo/server/trunk/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java Tue Jan 23 14:35:03 2007
@@ -181,6 +181,9 @@
             }
         }
         EjbJar ejbJar = XmlUtil.unmarshal(EjbJar.class, ejbJarXml);
+        if (ejbJar == null){
+            ejbJar = new EjbJar();
+        }
 
         // load the geronimo-openejb.xml
         boolean standAlone = earEnvironment == null;
@@ -199,6 +202,9 @@
         }
         String openejbJarXml = XmlUtil.loadOpenejbJarXml(object, moduleFile);
         OpenejbJar openejbJar = XmlUtil.unmarshal(OpenejbJar.class, openejbJarXml);
+        if (openejbJar == null){
+            openejbJar = new OpenejbJar();
+        }
 
         // initialize the geronimo environment
         EnvironmentType environmentType = geronimoOpenejb.getEnvironment();