svn commit: r607308 - /openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/EjbModule.java

[dblevins]

Author: dblevins
Date: Fri Dec 28 10:31:49 2007
New Revision: 607308

URL: http://svn.apache.org/viewvc?rev=607308&view=rev
Log:
More stringent setting of moduleId.  Should fix OPENEJB-707: 
NullPointerException creating app configuration in Assembler

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

Modified: 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/EjbModule.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/EjbModule.java?rev=607308&r1=607307&r2=607308&view=diff
==============================================================================
--- 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/EjbModule.java
 (original)
+++ 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/EjbModule.java
 Fri Dec 28 10:31:49 2007
@@ -64,7 +64,7 @@
         if (jarURI == null){
             if (moduleId != null){
                 jarURI = moduleId;
-            } else if (ejbJar.getId() != null){
+            } else if (ejbJar.getId() != null && !ejbJar.getId().equals("")){
                 jarURI = ejbJar.getId();
             } else {
                 jarURI = ejbJar.toString();
@@ -73,11 +73,14 @@
         this.jarLocation = jarURI;
 
         if (moduleId == null){
-            if (ejbJar != null && ejbJar.getId() != null){
+            if (ejbJar != null && ejbJar.getId() != null && 
!ejbJar.getId().equals("")){
                 moduleId = ejbJar.getId();
             } else {
                 File file = new File(jarURI);
                 moduleId = file.getName();
+                if (moduleId == null){
+                    moduleId = jarURI;
+                }
             }
         }
         this.moduleId = moduleId;