[Jboss-cvs] JBossAS SVN: r56420 - branches/Branch_4_0/system/src/main/org/jboss/deployment
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Aug 29 19:25:16 EDT 2006
Author: dimitris at jboss.org
Date: 2006-08-29 19:25:14 -0400 (Tue, 29 Aug 2006)
New Revision: 56420
Modified:
branches/Branch_4_0/system/src/main/org/jboss/deployment/MainDeployer.java
Log:
JBAS-3585, on shutdown avoid undeploying twice unpacked nested modules
Modified: branches/Branch_4_0/system/src/main/org/jboss/deployment/MainDeployer.java
===================================================================
--- branches/Branch_4_0/system/src/main/org/jboss/deployment/MainDeployer.java 2006-08-29 21:59:39 UTC (rev 56419)
+++ branches/Branch_4_0/system/src/main/org/jboss/deployment/MainDeployer.java 2006-08-29 23:25:14 UTC (rev 56420)
@@ -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();
More information about the jboss-cvs-commits
mailing list