You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by sp...@apache.org on 2007/01/16 17:45:04 UTC
svn commit: r496754 -
/geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
Author: sppatel
Date: Tue Jan 16 08:45:04 2007
New Revision: 496754
URL: http://svn.apache.org/viewvc?view=rev&rev=496754
Log:
fix NPE.. continue search if no applclient or ejbjar
Modified:
geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
Modified: geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java?view=diff&rev=496754&r1=496753&r2=496754
==============================================================================
--- geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java (original)
+++ geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java Tue Jan 16 08:45:04 2007
@@ -788,7 +788,6 @@
}
} else {
//no application.xml available, must inspect ear to locate and process modules
- //TODO //suport EE.8.2.1 bundled libraries
Enumeration entries = earFile.entries();
while (entries.hasMoreElements()) {
ModuleBuilder builder = null;
@@ -823,6 +822,8 @@
throw new DeploymentException("Cannot deploy ejb application; No ejb deployer defined: " + entry.getName());
}
moduleTypeName = "an EJB";
+ } else {
+ continue;
}
//TODO if no ejb-jar.xml inspect classes for EJB component annotations to identify as EJBJar module
} catch (IOException e) {