[jboss-cvs] JBossAS SVN: r69205 - projects/microcontainer/trunk/classloader/src/main/org/jboss/classloader/spi/base.

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

Author: adrian at jboss.org
Date: 2008-01-22 11:57:33 -0500 (Tue, 22 Jan 2008)
New Revision: 69205

Modified:
   projects/microcontainer/trunk/classloader/src/main/org/jboss/classloader/spi/base/BaseClassLoaderDomain.java
Log:
[JBMICRCONT-227] - Load resources locally first when given a classloader

Modified: projects/microcontainer/trunk/classloader/src/main/org/jboss/classloader/spi/base/BaseClassLoaderDomain.java
===================================================================
--- projects/microcontainer/trunk/classloader/src/main/org/jboss/classloader/spi/base/BaseClassLoaderDomain.java	2008-01-22 16:48:39 UTC (rev 69204)
+++ projects/microcontainer/trunk/classloader/src/main/org/jboss/classloader/spi/base/BaseClassLoaderDomain.java	2008-01-22 16:57:33 UTC (rev 69205)
@@ -302,6 +302,20 @@
    {
       boolean trace = log.isTraceEnabled();
 
+      // Try the classloader first
+      if (classLoader != null)
+      {
+         if (trace)
+            log.trace(this + " trying to get resource " + name + " from requesting " + classLoader);
+         URL result = classLoader.getResourceLocally(name);
+         if (result != null)
+         {
+            if (trace)
+               log.trace(this + " got resource from requesting " + classLoader + " " + result);
+            return result;
+         }
+      }
+
       if (getClassLoaderSystem() == null)
          throw new IllegalStateException("Domain is not registered with a classloader system: " + toLongString());
 
@@ -339,20 +353,6 @@
             return result;
       }
 
-      // Finally use any requesting classloader
-      if (classLoader != null)
-      {
-         if (trace)
-            log.trace(this + " trying to get resource " + name + " from requesting " + classLoader);
-         result = classLoader.getResourceLocally(name);
-         if (result != null)
-         {
-            if (trace)
-               log.trace(this + " got resource from requesting " + classLoader + " " + result);
-            return result;
-         }
-      }
-
       // Try the after attempt
       result = afterGetResource(name);
       if (result != null)