[jboss-cvs] JBossAS SVN: r65164 - trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers.

[jboss-cvs-commits at lists.jboss.org]

Author: remy.maucherat at jboss.com
Date: 2007-09-06 11:32:10 -0400 (Thu, 06 Sep 2007)
New Revision: 65164

Modified:
   trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java
Log:
- Throw deployment exceptions if things go wrong.

Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java	2007-09-06 15:21:37 UTC (rev 65163)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java	2007-09-06 15:32:10 UTC (rev 65164)
@@ -50,6 +50,7 @@
 import org.apache.catalina.Loader;
 import org.apache.catalina.core.StandardContext;
 import org.apache.tomcat.util.modeler.Registry;
+import org.jboss.deployers.spi.DeploymentException;
 import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
 import org.jboss.logging.Logger;
 import org.jboss.metadata.WebMetaData;
@@ -303,11 +304,19 @@
          context.start();
          // Build the ENC
       }
+      catch (Exception e)
+      {
+         throw new DeploymentException("URL " + warUrl + " deployment failed", e);
+      }
       finally
       {
          RunAsListener.metaDataLocal.set(null);
          JBossContextConfig.metaDataLocal.set(null);
          JBossContextConfig.metaDataShared.set(null);
+         if (context.getState() != 1)
+         {
+            throw new DeploymentException("URL " + warUrl + " deployment failed");
+         }
       }
 
       // Clustering