User: d_jencks
Date: 02/03/08 21:22:38
Modified: src/main/org/jboss/deployment MainDeployer.java
Log:
Changed MainDeployer to undeploy from outside in since it deploys from inside out
Revision Changes Path
1.18 +27 -27 jboss-system/src/main/org/jboss/deployment/MainDeployer.java
Index: MainDeployer.java
===================================================================
RCS file:
/cvsroot/jboss/jboss-system/src/main/org/jboss/deployment/MainDeployer.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- MainDeployer.java 8 Mar 2002 17:51:12 -0000 1.17
+++ MainDeployer.java 9 Mar 2002 05:22:38 -0000 1.18
@@ -58,7 +58,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Marc Fleury</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Scott Stark</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>David Jencks</a>
- * @version $Revision: 1.17 $
+ * @version $Revision: 1.18 $
* @jmx:mbean name="jboss.system:service=MainDeployer"
* extends="org.jboss.system.ServiceMBean"
*/
@@ -331,19 +331,7 @@
*/
private void stop(DeploymentInfo di)
{
- // First remove all sub-deployments
- for (Iterator subs = di.subDeployments.iterator(); subs.hasNext();)
- {
- DeploymentInfo sub = (DeploymentInfo) subs.next();
-
- if (log.isDebugEnabled())
- {
- log.debug("Stopping sub deployment: "+sub.url);
- }
- stop(sub);
- }
-
- // Then remove the deployment itself
+ // First stop this deployment itself
try
{
// Tell the respective deployer to undeploy this one
@@ -356,28 +344,28 @@
{
log.error("Undeployment failed: " + di.url, t);
}
- }
-
- /**
- * The <code>destroy</code> method is the second and final internal undeployment
step.
- *
- * @param di a <code>DeploymentInfo</code> value
- */
- private void destroy(DeploymentInfo di)
- {
- // First remove all sub-deployments
+ // Then stop all sub-deployments
for (Iterator subs = di.subDeployments.iterator(); subs.hasNext();)
{
DeploymentInfo sub = (DeploymentInfo) subs.next();
if (log.isDebugEnabled())
{
- log.debug("Destroying sub deployment: "+sub.url);
+ log.debug("Stopping sub deployment: "+sub.url);
}
- destroy(sub);
+ stop(sub);
}
- // Then remove the deployment itself
+ }
+
+ /**
+ * The <code>destroy</code> method is the second and final internal undeployment
step.
+ *
+ * @param di a <code>DeploymentInfo</code> value
+ */
+ private void destroy(DeploymentInfo di)
+ {
+ // First destroy the deployment itself
try
{
// Tell the respective deployer to undeploy this one
@@ -389,6 +377,18 @@
catch (Throwable t)
{
log.error("Undeployment failed: " + di.url, t);
+ }
+
+ // Then destroy all sub-deployments
+ for (Iterator subs = di.subDeployments.iterator(); subs.hasNext();)
+ {
+ DeploymentInfo sub = (DeploymentInfo) subs.next();
+
+ if (log.isDebugEnabled())
+ {
+ log.debug("Destroying sub deployment: "+sub.url);
+ }
+ destroy(sub);
}
try
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
