[jboss-cvs] JBossAS SVN: r101860 - in projects/jboss-cl/trunk/classloading/src: test/java/org/jboss/test/classloading/lifecycle/support/a and 1 other directory.

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

Author: adrian at jboss.org
Date: 2010-03-04 11:06:25 -0500 (Thu, 04 Mar 2010)
New Revision: 101860

Modified:
   projects/jboss-cl/trunk/classloading/src/main/java/org/jboss/classloading/spi/dependency/LifeCycle.java
   projects/jboss-cl/trunk/classloading/src/main/java/org/jboss/classloading/spi/dependency/Module.java
   projects/jboss-cl/trunk/classloading/src/test/java/org/jboss/test/classloading/lifecycle/support/a/MockLifeCycle.java
Log:
[JBCL-154] - Add a boolean return to resolve saying whether the lifecycles were resolved.

Modified: projects/jboss-cl/trunk/classloading/src/main/java/org/jboss/classloading/spi/dependency/LifeCycle.java
===================================================================
--- projects/jboss-cl/trunk/classloading/src/main/java/org/jboss/classloading/spi/dependency/LifeCycle.java	2010-03-04 16:02:30 UTC (rev 101859)
+++ projects/jboss-cl/trunk/classloading/src/main/java/org/jboss/classloading/spi/dependency/LifeCycle.java	2010-03-04 16:06:25 UTC (rev 101860)
@@ -160,27 +160,35 @@
    /**
     * Resolve the classloader
     * 
+    * @return true if it is actually resolved
     * @throws Exception for any error
     */
-   public void resolve() throws Exception
+   public boolean resolve() throws Exception
    {
+      return true;
    }
    
    /**
     * Resolve lots of lifecycles
     * 
     * @param lifecycles the lifecycles to resolve
+    * @return true if they are all resolved
     * @throws Exception for any error
     */
-   public void resolve(LifeCycle... lifecycles) throws Exception
+   public boolean resolve(LifeCycle... lifecycles) throws Exception
    {
       if (lifecycles == null || lifecycles.length == 0)
-         return;
+         return true;
+      boolean result = true;
       for (LifeCycle lifecycle : lifecycles)
       {
          if (lifecycle.isResolved() == false)
-            lifecycle.resolve();
+         {
+            if (lifecycle.resolve() == false)
+               result = false;
+         }
       }
+      return result;
    }
    
    /**

Modified: projects/jboss-cl/trunk/classloading/src/main/java/org/jboss/classloading/spi/dependency/Module.java
===================================================================
--- projects/jboss-cl/trunk/classloading/src/main/java/org/jboss/classloading/spi/dependency/Module.java	2010-03-04 16:02:30 UTC (rev 101859)
+++ projects/jboss-cl/trunk/classloading/src/main/java/org/jboss/classloading/spi/dependency/Module.java	2010-03-04 16:06:25 UTC (rev 101860)
@@ -924,14 +924,7 @@
          lifeCycles[i] = lifeCycle; 
       }
 
-      lifeCycles[0].resolve(lifeCycles);
-      
-      for (LifeCycle lifeCycle : lifeCycles)
-      {
-         if (lifeCycle.isResolved() == false)
-            return false;
-      }
-      return true;
+      return lifeCycles[0].resolve(lifeCycles);
    }
 
    /**

Modified: projects/jboss-cl/trunk/classloading/src/test/java/org/jboss/test/classloading/lifecycle/support/a/MockLifeCycle.java
===================================================================
--- projects/jboss-cl/trunk/classloading/src/test/java/org/jboss/test/classloading/lifecycle/support/a/MockLifeCycle.java	2010-03-04 16:02:30 UTC (rev 101859)
+++ projects/jboss-cl/trunk/classloading/src/test/java/org/jboss/test/classloading/lifecycle/support/a/MockLifeCycle.java	2010-03-04 16:06:25 UTC (rev 101860)
@@ -62,10 +62,11 @@
    }
    
    @Override
-   public void resolve()
+   public boolean resolve()
    {
       gotResolve = true;
       getModule().resolveIt();
+      return isResolved();
    }
 
    @Override