geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jboy...@apache.org
Subject svn commit: rev 47336 - geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/service
Date Mon, 27 Sep 2004 22:02:14 GMT
Author: jboynes
Date: Mon Sep 27 15:02:13 2004
New Revision: 47336

Modified:
   geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java
Log:
Dont fail when fed a J2EE plan

Modified: geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java
==============================================================================
--- geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java
(original)
+++ geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java
Mon Sep 27 15:02:13 2004
@@ -48,6 +48,7 @@
 import org.apache.geronimo.kernel.config.ConfigurationModuleType;
 import org.apache.geronimo.kernel.repository.Repository;
 import org.apache.xmlbeans.XmlObject;
+import org.apache.xmlbeans.XmlException;
 
 /**
  * @version $Rev$ $Date$
@@ -70,9 +71,12 @@
             return null;
         }
 
+        // todo tell the difference between an invalid plan and one that's not for me
         try {
             ConfigurationDocument configurationDoc = ConfigurationDocument.Factory.parse(planFile);
             return configurationDoc.getConfiguration();
+        } catch (XmlException e) {
+            return null;
         } catch (Exception e) {
             throw new DeploymentException(e);
         }

Mime
View raw message