[jboss-cvs] JBossAS SVN: r106047 - in projects/jboss-cl/trunk: classloading/src/main/java/org/jboss/classloading/spi/dependency and 1 other directory.

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

Author: alesj
Date: 2010-06-15 06:57:04 -0400 (Tue, 15 Jun 2010)
New Revision: 106047

Modified:
   projects/jboss-cl/trunk/classloader/src/main/java/org/jboss/classloader/spi/base/ClassLoaderInformation.java
   projects/jboss-cl/trunk/classloading/src/main/java/org/jboss/classloading/spi/dependency/RequirementDependencyItem.java
Log:
Fix revert error.

Modified: projects/jboss-cl/trunk/classloader/src/main/java/org/jboss/classloader/spi/base/ClassLoaderInformation.java
===================================================================
--- projects/jboss-cl/trunk/classloader/src/main/java/org/jboss/classloader/spi/base/ClassLoaderInformation.java	2010-06-15 10:08:41 UTC (rev 106046)
+++ projects/jboss-cl/trunk/classloader/src/main/java/org/jboss/classloader/spi/base/ClassLoaderInformation.java	2010-06-15 10:57:04 UTC (rev 106047)
@@ -302,7 +302,7 @@
          {
             // we can blacklist atm, but the new one can't
             if (cantBlacklist == 0)
-               destroyCache();
+               destroyBlackList();
 
             cantBlacklist++;
          }

Modified: projects/jboss-cl/trunk/classloading/src/main/java/org/jboss/classloading/spi/dependency/RequirementDependencyItem.java
===================================================================
--- projects/jboss-cl/trunk/classloading/src/main/java/org/jboss/classloading/spi/dependency/RequirementDependencyItem.java	2010-06-15 10:08:41 UTC (rev 106046)
+++ projects/jboss-cl/trunk/classloading/src/main/java/org/jboss/classloading/spi/dependency/RequirementDependencyItem.java	2010-06-15 10:57:04 UTC (rev 106047)
@@ -126,18 +126,18 @@
          return isResolved();
       }
 
+      // TODO - any reason why requesting module wasn't considered as resolving module?
+      resolvedModule = module;
+
       // Self dependency
       if (module == this.module)
       {
          ControllerContext context = module.getControllerContext();
          setIDependOn(context.getName());
-         resolvedModule = module;
          setResolved(true);
-         return true;
+         return isResolved();
       }
 
-      resolvedModule = module;
-
       // Use semi-resolve to avoid circular references  
       ControllerContext context = module.getControllerContext();
       if (context != null)