[jboss-cvs] JBossAS SVN: r106054 - projects/jboss-cl/trunk/classloading/src/main/java/org/jboss/classloading/spi/dependency.

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

Author: alesj
Date: 2010-06-15 09:38:00 -0400 (Tue, 15 Jun 2010)
New Revision: 106054

Modified:
   projects/jboss-cl/trunk/classloading/src/main/java/org/jboss/classloading/spi/dependency/WildcardDelegateLoader.java
Log:
Use same state for both wires.

Modified: projects/jboss-cl/trunk/classloading/src/main/java/org/jboss/classloading/spi/dependency/WildcardDelegateLoader.java
===================================================================
--- projects/jboss-cl/trunk/classloading/src/main/java/org/jboss/classloading/spi/dependency/WildcardDelegateLoader.java	2010-06-15 13:33:38 UTC (rev 106053)
+++ projects/jboss-cl/trunk/classloading/src/main/java/org/jboss/classloading/spi/dependency/WildcardDelegateLoader.java	2010-06-15 13:38:00 UTC (rev 106054)
@@ -77,7 +77,8 @@
    protected DelegateLoader resolve(String pckg)
    {
       Requirement requirement = new PackageRequirement(pckg, range);
-      WildcardRequirementDependencyItem item = new WildcardRequirementDependencyItem(module, requirement, module.getClassLoaderState());
+      ControllerState state = module.getClassLoaderState(); // let's make both sides resolved at the same cl state
+      WildcardRequirementDependencyItem item = new WildcardRequirementDependencyItem(module, requirement, state, state);
       if (item.resolve(controller))
       {
          Module resolvedModule = item.getResolvedModule();
@@ -131,9 +132,9 @@
    {
       private DelegateLoader loader;
 
-      private WildcardRequirementDependencyItem(Module module, Requirement requirement, ControllerState whenRequired)
+      private WildcardRequirementDependencyItem(Module module, Requirement requirement, ControllerState whenRequired, ControllerState dependentState)
       {
-         super(module, requirement, whenRequired, ControllerState.INSTALLED);
+         super(module, requirement, whenRequired, dependentState);
       }
 
       @Override