[jboss-cvs] JBossAS SVN: r105903 - 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-09 15:46:57 -0400 (Wed, 09 Jun 2010)
New Revision: 105903

Modified:
   projects/jboss-cl/trunk/classloading/src/main/java/org/jboss/classloading/spi/dependency/WildcardDelegateLoader.java
Log:
No need to cast to CLPModule.

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-09 19:25:53 UTC (rev 105902)
+++ projects/jboss-cl/trunk/classloading/src/main/java/org/jboss/classloading/spi/dependency/WildcardDelegateLoader.java	2010-06-09 19:46:57 UTC (rev 105903)
@@ -34,7 +34,6 @@
 import org.jboss.classloader.spi.filter.ClassFilter;
 import org.jboss.classloader.spi.filter.FilteredDelegateLoader;
 import org.jboss.classloading.plugins.metadata.PackageRequirement;
-import org.jboss.classloading.spi.dependency.policy.ClassLoaderPolicyModule;
 import org.jboss.classloading.spi.metadata.Requirement;
 import org.jboss.classloading.spi.version.VersionRange;
 import org.jboss.dependency.spi.Controller;
@@ -81,21 +80,18 @@
       WildcardRequirementDependencyItem item = new WildcardRequirementDependencyItem(module, requirement, module.getClassLoaderState());
       if (item.resolve(controller))
       {
-         module.addIDependOn(item);
-         
          Module resolvedModule = item.getResolvedModule();
-         if (resolvedModule instanceof ClassLoaderPolicyModule)
-         {
-            ClassLoaderPolicyModule clpm = (ClassLoaderPolicyModule) resolvedModule;
-            DelegateLoader loader = clpm.getDelegateLoader(module, requirement);
-            loader.setImportType(ImportType.AFTER); // allow normal imports to run before
-            item.setLoader(loader);
 
-            ClassLoaderPolicy policy = getPolicy();
-            policy.addExtraDelegate(loader);
+         DelegateLoader loader = resolvedModule.getDelegateLoader(module, requirement);
+         loader.setImportType(ImportType.AFTER); // allow normal imports to run before
+         item.setLoader(loader); // remember the loader wrt item
 
-            return loader;
-         }
+         ClassLoaderPolicy policy = getPolicy();
+         policy.addExtraDelegate(loader);
+
+         module.addIDependOn(item);
+
+         return loader;
       }
       return null;
    }