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

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

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

Modified:
   projects/jboss-cl/branches/jbosgi342/classloader/src/main/java/org/jboss/classloader/spi/base/ClassLoaderInformation.java
   projects/jboss-cl/branches/jbosgi342/classloading/src/main/java/org/jboss/classloading/spi/dependency/Domain.java
   projects/jboss-cl/branches/jbosgi342/classloading/src/main/java/org/jboss/classloading/spi/dependency/RequirementDependencyItem.java
   projects/jboss-cl/branches/jbosgi342/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
Fix typo in ClassLoaderInformation 


Modified: projects/jboss-cl/branches/jbosgi342/classloader/src/main/java/org/jboss/classloader/spi/base/ClassLoaderInformation.java
===================================================================
--- projects/jboss-cl/branches/jbosgi342/classloader/src/main/java/org/jboss/classloader/spi/base/ClassLoaderInformation.java	2010-06-15 17:34:11 UTC (rev 106064)
+++ projects/jboss-cl/branches/jbosgi342/classloader/src/main/java/org/jboss/classloader/spi/base/ClassLoaderInformation.java	2010-06-15 18:03:18 UTC (rev 106065)
@@ -302,7 +302,7 @@
          {
             // we can blacklist atm, but the new one can't
             if (cantBlacklist == 0)
-               destroyCache();
+               destroyBlackList();
 
             cantBlacklist++;
          }

Modified: projects/jboss-cl/branches/jbosgi342/classloading/src/main/java/org/jboss/classloading/spi/dependency/Domain.java
===================================================================
--- projects/jboss-cl/branches/jbosgi342/classloading/src/main/java/org/jboss/classloading/spi/dependency/Domain.java	2010-06-15 17:34:11 UTC (rev 106064)
+++ projects/jboss-cl/branches/jbosgi342/classloading/src/main/java/org/jboss/classloading/spi/dependency/Domain.java	2010-06-15 18:03:18 UTC (rev 106065)
@@ -299,15 +299,8 @@
             return result;
       }
 
-      Module result = null;
-      Capability firstMatch = null;
-      
       for (Module other : modules)
       {
-         // A dynamic import cannot resolve against the same module that requires the import
-         if (requirement.isDynamic() && requirement.isOptional() == false && module == other)
-            continue;
-         
          List<Capability> capabilities = other.getCapabilities();
          if (capabilities != null)
          {
@@ -315,23 +308,15 @@
             {
                if (capability.resolves(module, requirement))
                {
-                  if (firstMatch != null && other != result)
-                  {
-                     log.debug("Requirement " + requirement + " resolves agaist " + firstMatch + " and " + capability + " - using first.");
-                  }
-                  if (result == null)
-                  {
-                     firstMatch = capability;
-                     result = other;
-                  }
+                  if (log.isTraceEnabled())
+                     log.trace("Requirement " + requirement + " resolves against " + capability);
+
+                  return other;
                }
             }
          }
       }
 
-      if (result != null)
-         return result;
-
       // Check the parent afterwards when required
       if (parentDomain != null && parentFirst == false)
          return parentDomain.resolveModule(module, requirement);

Modified: projects/jboss-cl/branches/jbosgi342/classloading/src/main/java/org/jboss/classloading/spi/dependency/RequirementDependencyItem.java
===================================================================
--- projects/jboss-cl/branches/jbosgi342/classloading/src/main/java/org/jboss/classloading/spi/dependency/RequirementDependencyItem.java	2010-06-15 17:34:11 UTC (rev 106064)
+++ projects/jboss-cl/branches/jbosgi342/classloading/src/main/java/org/jboss/classloading/spi/dependency/RequirementDependencyItem.java	2010-06-15 18:03:18 UTC (rev 106065)
@@ -39,7 +39,6 @@
 public class RequirementDependencyItem extends AbstractDependencyItem
 {
    /** The log */
-   @SuppressWarnings("hiding")
    private static final Logger log = Logger.getLogger(RequirementDependencyItem.class);
 
    /** The module */
@@ -126,18 +125,17 @@
          return isResolved();
       }
 
+      resolvedModule = module;
+
       // Self dependency
       if (module == this.module)
       {
          ControllerContext context = module.getControllerContext();
          setIDependOn(context.getName());
-         resolvedModule = module;
          setResolved(true);
          return true;
       }
 
-      resolvedModule = module;
-
       // Use semi-resolve to avoid circular references  
       ControllerContext context = module.getControllerContext();
       if (context != null)

Modified: projects/jboss-cl/branches/jbosgi342/classloading/src/main/java/org/jboss/classloading/spi/dependency/WildcardDelegateLoader.java
===================================================================
--- projects/jboss-cl/branches/jbosgi342/classloading/src/main/java/org/jboss/classloading/spi/dependency/WildcardDelegateLoader.java	2010-06-15 17:34:11 UTC (rev 106064)
+++ projects/jboss-cl/branches/jbosgi342/classloading/src/main/java/org/jboss/classloading/spi/dependency/WildcardDelegateLoader.java	2010-06-15 18:03:18 UTC (rev 106065)
@@ -133,7 +133,7 @@
 
       private WildcardRequirementDependencyItem(Module module, Requirement requirement, ControllerState whenRequired)
       {
-         super(module, requirement, whenRequired, ControllerState.INSTALLED);
+         super(module, requirement, whenRequired, whenRequired);
       }
 
       @Override