[jboss-svn-commits] JBoss Common SVN: r2258 - common-old/branches/Branch_1_0/src/main/org/jboss/util/loading.

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

Author: scott.stark at jboss.org
Date: 2007-02-05 13:31:47 -0500 (Mon, 05 Feb 2007)
New Revision: 2258

Modified:
   common-old/branches/Branch_1_0/src/main/org/jboss/util/loading/DelegatingClassLoader.java
Log:
JBAS-3691, try findLoadedClass on CNFE to pickup $Proxy resolution behavior required by some VMs.

Modified: common-old/branches/Branch_1_0/src/main/org/jboss/util/loading/DelegatingClassLoader.java
===================================================================
--- common-old/branches/Branch_1_0/src/main/org/jboss/util/loading/DelegatingClassLoader.java	2007-02-05 17:43:15 UTC (rev 2257)
+++ common-old/branches/Branch_1_0/src/main/org/jboss/util/loading/DelegatingClassLoader.java	2007-02-05 18:31:47 UTC (rev 2258)
@@ -86,7 +86,19 @@
          return super.loadClass(className, resolve);
 
       // Ask the parent
-      Class clazz = getParent().loadClass(className);
+      Class clazz = null;
+      try
+      {
+         clazz = getParent().loadClass(className);
+      }
+      catch (ClassNotFoundException e)
+      {
+         // Not found in parent,
+         // maybe it is a proxy registered against this classloader?
+         clazz = findLoadedClass(className);
+         if (clazz == null)
+            throw e;
+      }
 
       // Link the class
       if (resolve)