[Jboss-cvs] JBossAS SVN: r56424 - trunk/system/src/main/org/jboss/deployment

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

Author: dimitris at jboss.org
Date: 2006-08-29 19:34:00 -0400 (Tue, 29 Aug 2006)
New Revision: 56424

Modified:
   trunk/system/src/main/org/jboss/deployment/MainDeployer.java
Log:
JBAS-3585, on shutdown avoid undeploying twice unpacked nested modules

Modified: trunk/system/src/main/org/jboss/deployment/MainDeployer.java
===================================================================
--- trunk/system/src/main/org/jboss/deployment/MainDeployer.java	2006-08-29 23:32:39 UTC (rev 56423)
+++ trunk/system/src/main/org/jboss/deployment/MainDeployer.java	2006-08-29 23:34:00 UTC (rev 56424)
@@ -507,14 +507,20 @@
       {
          try
          {
-            undeploy((DeploymentInfo)i.previous(), true);
-            deployCounter++;
+            DeploymentInfo di = (DeploymentInfo)i.previous();
+            
+            // A nested deployment may be already undeployed by the outer deployment
+            // so check at this point to avoid undeploying twice, see JBAS-3585.
+            if (getDeployment(di.url) != null)
+            {
+               undeploy(di, true);
+               deployCounter++;
+            }
          }
          catch (Exception e)
          {
             log.info("exception trying to undeploy during shutdown", e);
          }
-
       }
       // Help GC
       this.deployers.clear();