[jboss-cvs] JBossAS SVN: r106069 - 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 15:47:18 -0400 (Tue, 15 Jun 2010)
New Revision: 106069

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 18:33:03 UTC (rev 106068)
+++ projects/jboss-cl/trunk/classloading/src/main/java/org/jboss/classloading/spi/dependency/WildcardDelegateLoader.java	2010-06-15 19:47:18 UTC (rev 106069)
@@ -78,7 +78,8 @@
    {
       Requirement requirement = new PackageRequirement(pckg, range);
       ControllerState state = module.getClassLoaderState();
-      WildcardRequirementDependencyItem item = new WildcardRequirementDependencyItem(module, requirement, state);
+      // resolve both sides of the wire at the same state
+      WildcardRequirementDependencyItem item = new WildcardRequirementDependencyItem(module, requirement, state, state);
       if (item.resolve(controller))
       {
          Module resolvedModule = item.getResolvedModule();
@@ -132,10 +133,9 @@
    {
       private DelegateLoader loader;
 
-      private WildcardRequirementDependencyItem(Module module, Requirement requirement, ControllerState whenRequired)
+      private WildcardRequirementDependencyItem(Module module, Requirement requirement, ControllerState whenRequired, ControllerState dependentState)
       {
-         // Resolves against an exporter at the same stage
-         super(module, requirement, whenRequired, whenRequired);
+         super(module, requirement, whenRequired, dependentState);
       }
 
       @Override