[jboss-cvs] JBossAS SVN: r101865 - projects/jboss-deployers/trunk/deployers-impl/src/main/java/org/jboss/deployers/plugins/classloading.

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

Author: adrian at jboss.org
Date: 2010-03-04 11:15:31 -0500 (Thu, 04 Mar 2010)
New Revision: 101865

Modified:
   projects/jboss-deployers/trunk/deployers-impl/src/main/java/org/jboss/deployers/plugins/classloading/DeploymentLifeCycle.java
Log:
[JBDEPLOY-247] - Add a boolean return to resolve saying whether the lifecycles were resolved.

Modified: projects/jboss-deployers/trunk/deployers-impl/src/main/java/org/jboss/deployers/plugins/classloading/DeploymentLifeCycle.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-impl/src/main/java/org/jboss/deployers/plugins/classloading/DeploymentLifeCycle.java	2010-03-04 16:15:24 UTC (rev 101864)
+++ projects/jboss-deployers/trunk/deployers-impl/src/main/java/org/jboss/deployers/plugins/classloading/DeploymentLifeCycle.java	2010-03-04 16:15:31 UTC (rev 101865)
@@ -26,6 +26,7 @@
 
 import org.jboss.classloading.spi.dependency.LifeCycle;
 import org.jboss.deployers.client.spi.DeployerClientChangeExt;
+import org.jboss.deployers.client.spi.IncompleteDeploymentException;
 import org.jboss.deployers.client.spi.main.MainDeployer;
 import org.jboss.deployers.spi.deployer.DeploymentStages;
 
@@ -74,14 +75,18 @@
    }
 
    @Override
-   public void resolve() throws Exception
+   public boolean resolve() throws Exception
    {
       if (isResolved() == false)
+      {
          getMainDeployer().change(getModule().getDeploymentUnit().getName(), DeploymentStages.CLASSLOADER);
+         return isResolved();
+      }
+      return true;
    }
 
    @Override
-   public void resolve(LifeCycle... lifecycles) throws Exception
+   public boolean resolve(LifeCycle... lifecycles) throws Exception
    {
       DeployerClientChangeExt changer = getChanger();
       Set<DeploymentLifeCycle> deploymentLifeCycles = null;
@@ -89,8 +94,7 @@
          deploymentLifeCycles = getDeploymentLifeCycles(lifecycles);
       if (deploymentLifeCycles == null)
       {
-         super.resolve(lifecycles);
-         return;
+         return super.resolve(lifecycles);
       }
       Set<String> names = new LinkedHashSet<String>(lifecycles.length);
       for (DeploymentLifeCycle lifeCycle : deploymentLifeCycles)
@@ -99,7 +103,17 @@
             names.add(lifeCycle.getModule().getDeploymentUnit().getName());
       }
       if (names.isEmpty() == false)
-         changer.change(DeploymentStages.CLASSLOADER, false, names.toArray(new String[names.size()]));
+      {
+         try
+         {
+            changer.change(DeploymentStages.CLASSLOADER, true, names.toArray(new String[names.size()]));
+         }
+         catch (IncompleteDeploymentException e)
+         {
+            return false;
+         }
+      }
+      return true;
    }
 
    @Override