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

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

Author: thomas.diesler at jboss.com
Date: 2010-06-15 14:18:42 -0400 (Tue, 15 Jun 2010)
New Revision: 106066

Modified:
   projects/jboss-cl/trunk/classloading/src/main/java/org/jboss/classloading/spi/dependency/Domain.java
   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/WildcardDelegateLoader.java
Log:
Trace how requirements resolve against capabilities
WildcardRequirementDependencyItem resolves against an exporter at the same stage



Modified: projects/jboss-cl/trunk/classloading/src/main/java/org/jboss/classloading/spi/dependency/Domain.java
===================================================================
--- projects/jboss-cl/trunk/classloading/src/main/java/org/jboss/classloading/spi/dependency/Domain.java	2010-06-15 18:03:18 UTC (rev 106065)
+++ projects/jboss-cl/trunk/classloading/src/main/java/org/jboss/classloading/spi/dependency/Domain.java	2010-06-15 18:18:42 UTC (rev 106066)
@@ -173,9 +173,9 @@
       {
          removeModule(module);
          if (t instanceof RuntimeException)
-            throw (RuntimeException) t;
+            throw (RuntimeException)t;
          else if (t instanceof Error)
-            throw (Error) t;
+            throw (Error)t;
          else
             throw new RuntimeException("Error adding module " + module, t);
       }
@@ -299,7 +299,6 @@
             return result;
       }
 
-      Module firstMatch = null;
       for (Module other : modules)
       {
          List<Capability> capabilities = other.getCapabilities();
@@ -309,22 +308,15 @@
             {
                if (capability.resolves(module, requirement))
                {
-                  if (firstMatch != null)
-                  {
-                     String otherName = other.getName() + ":" + other.getVersion();
-                     String firstName = firstMatch.getName() + ":" + firstMatch.getVersion();
-                     log.debug("Requirement " + requirement + " resolves agaist " + firstName + " and " + otherName + " - using first.");
-                  }
-                  if (firstMatch == null)
-                     firstMatch = other;
+                  if (log.isTraceEnabled())
+                     log.trace("Requirement " + requirement + " resolves against " + capability);
+
+                  return other;
                }
             }
          }
       }
 
-      if (firstMatch != null)
-         return firstMatch;
-
       // Check the parent afterwards when required
       if (parentDomain != null && parentFirst == false)
          return parentDomain.resolveModule(module, requirement);
@@ -414,7 +406,7 @@
                Requirement requirement = dependencyItem.getRequirement();
                if (requirement instanceof ModuleRequirement && dependencyItem.isResolved())
                {
-                  ModuleRequirement moduleRequirement = (ModuleRequirement) requirement;
+                  ModuleRequirement moduleRequirement = (ModuleRequirement)requirement;
                   if (name == null || name.equals(moduleRequirement.getName()))
                   {
                      if (range.isConsistent(moduleRequirement.getVersionRange()))
@@ -469,7 +461,7 @@
             {
                if (capability instanceof PackageCapability && capability.resolves(module, requirement))
                {
-                  ExportPackage exportPackage = new ExportPackage(module, (PackageCapability) capability);
+                  ExportPackage exportPackage = new ExportPackage(module, (PackageCapability)capability);
                   result.add(exportPackage);
                   break;
                }

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 18:03:18 UTC (rev 106065)
+++ projects/jboss-cl/trunk/classloading/src/main/java/org/jboss/classloading/spi/dependency/RequirementDependencyItem.java	2010-06-15 18:18:42 UTC (rev 106066)
@@ -39,7 +39,6 @@
 public class RequirementDependencyItem extends AbstractDependencyItem
 {
    /** The log */
-   @SuppressWarnings("hiding")
    private static final Logger log = Logger.getLogger(RequirementDependencyItem.class);
 
    /** The module */

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:03:18 UTC (rev 106065)
+++ projects/jboss-cl/trunk/classloading/src/main/java/org/jboss/classloading/spi/dependency/WildcardDelegateLoader.java	2010-06-15 18:18:42 UTC (rev 106066)
@@ -77,8 +77,8 @@
    protected DelegateLoader resolve(String pckg)
    {
       Requirement requirement = new PackageRequirement(pckg, range);
-      ControllerState state = module.getClassLoaderState(); // let's make both sides resolved at the same cl state
-      WildcardRequirementDependencyItem item = new WildcardRequirementDependencyItem(module, requirement, state, state);
+      ControllerState state = module.getClassLoaderState();
+      WildcardRequirementDependencyItem item = new WildcardRequirementDependencyItem(module, requirement, state);
       if (item.resolve(controller))
       {
          Module resolvedModule = item.getResolvedModule();
@@ -132,9 +132,10 @@
    {
       private DelegateLoader loader;
 
-      private WildcardRequirementDependencyItem(Module module, Requirement requirement, ControllerState whenRequired, ControllerState dependentState)
+      private WildcardRequirementDependencyItem(Module module, Requirement requirement, ControllerState whenRequired)
       {
-         super(module, requirement, whenRequired, dependentState);
+         // Resolves against an exporter at the same stage
+         super(module, requirement, whenRequired, whenRequired);
       }
 
       @Override