Author: julien(a)jboss.com Date: 2007-02-05 09:40:51 -0500 (Mon, 05 Feb 2007) New Revision: 6152 Modified: trunk/server/src/main/org/jboss/portal/server/deployment/jboss/PortalDeploymentInfoContext.java Log: JBPORTAL-1229 : no clean shutdown of jboss portal Modified: trunk/server/src/main/org/jboss/portal/server/deployment/jboss/PortalDeploymentInfoContext.java =================================================================== --- trunk/server/src/main/org/jboss/portal/server/deployment/jboss/PortalDeploymentInfoContext.java 2007-02-05 14:12:51 UTC (rev 6151) +++ trunk/server/src/main/org/jboss/portal/server/deployment/jboss/PortalDeploymentInfoContext.java 2007-02-05 14:40:51 UTC (rev 6152) @@ -96,7 +96,7 @@ } } - public void remove(DeploymentFactoryContext factoryContext, boolean proceedLifcycle) + public void remove(DeploymentFactoryContext factoryContext, boolean proceedLifecycle) { for (Iterator i = new HashSet(deployments.keySet()).iterator(); i.hasNext();) { @@ -104,18 +104,19 @@ for (Iterator j = deployments.iterator(childURL); j.hasNext();) { DeploymentContext deploymentContext = (DeploymentContext)j.next(); + + // Take care of it only if the factory deployed it if (deploymentContext.getFactoryContext().getName().equals(factoryContext.getName())) { j.remove(); // - if (proceedLifcycle) + if (proceedLifecycle) { - DeploymentContext ctx = (DeploymentContext)j.next(); try { - ctx.stop(); - ctx.destroy(); + deploymentContext.stop(); + deploymentContext.destroy(); } catch (DeploymentException e) {