geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ammul...@apache.org
Subject svn commit: r394537 - /geronimo/branches/1.1/modules/service-builder/src/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java
Date Sun, 16 Apr 2006 18:30:30 GMT
Author: ammulder
Date: Sun Apr 16 11:30:27 2006
New Revision: 394537

URL: http://svn.apache.org/viewcvs?rev=394537&view=rev
Log:
Quick fix

Modified:
    geronimo/branches/1.1/modules/service-builder/src/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java

Modified: geronimo/branches/1.1/modules/service-builder/src/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/service-builder/src/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java?rev=394537&r1=394536&r2=394537&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/service-builder/src/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java
(original)
+++ geronimo/branches/1.1/modules/service-builder/src/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java
Sun Apr 16 11:30:27 2006
@@ -19,6 +19,7 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.io.FileNotFoundException;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
@@ -126,7 +127,13 @@
                 xmlObject = XmlBeansUtil.parse(planFile.toURL());
             } else {
                 URL path = DeploymentUtil.createJarURL(jarFile, "META-INF/geronimo-service.xml");
-                xmlObject = XmlBeansUtil.parse(path);
+                try {
+                    xmlObject = XmlBeansUtil.parse(path);
+                } catch (FileNotFoundException e) {
+                    // It has a JAR but no plan, and nothing at META-INF/geronimo-service.xml,
+                    // therefore it's not a service deployment
+                    return null;
+                }
             }
             if(xmlObject == null) {
                 return null;



Mime
View raw message