geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xuhaih...@apache.org
Subject svn commit: r946093 - /geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
Date Wed, 19 May 2010 09:16:32 GMT
Author: xuhaihong
Date: Wed May 19 09:16:31 2010
New Revision: 946093

URL: http://svn.apache.org/viewvc?rev=946093&view=rev
Log:
Revert the change, the default instance might need to create after searching the modules

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

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java?rev=946093&r1=946092&r2=946093&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
(original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
Wed May 19 09:16:31 2010
@@ -374,9 +374,7 @@ public class EARConfigBuilder implements
                 throw new DeploymentException("Could not parse application.xml", e);
             } catch (Exception e) {
                 //ee5 spec allows optional application.xml, continue with application ==
null
-                if (earFile.getName().endsWith(".ear")) {
-                    application = ApplicationType.Factory.newInstance();
-                } else {
+                if (!earFile.getName().endsWith(".ear")) {
                     return null;
                 }
                 //TODO return application.xml that we can make metadata complete?



Mime
View raw message