[jboss-cvs] JBossAS SVN: r57658 - in branches/JBoss_4_0_2_JBAS-3762: common/src/main/org/jboss/util/loading deployment

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

Author: darran.lofthouse at jboss.com
Date: 2006-10-13 11:08:20 -0400 (Fri, 13 Oct 2006)
New Revision: 57658

Modified:
   branches/JBoss_4_0_2_JBAS-3762/common/src/main/org/jboss/util/loading/DelegatingClassLoader.java
   branches/JBoss_4_0_2_JBAS-3762/deployment/.project
Log:
JBAS-3762 - If parent classloader does not return class attempt to load it with this classloader.


Modified: branches/JBoss_4_0_2_JBAS-3762/common/src/main/org/jboss/util/loading/DelegatingClassLoader.java
===================================================================
--- branches/JBoss_4_0_2_JBAS-3762/common/src/main/org/jboss/util/loading/DelegatingClassLoader.java	2006-10-13 14:42:11 UTC (rev 57657)
+++ branches/JBoss_4_0_2_JBAS-3762/common/src/main/org/jboss/util/loading/DelegatingClassLoader.java	2006-10-13 15:08:20 UTC (rev 57658)
@@ -69,14 +69,26 @@
    protected Class loadClass(String className, boolean resolve)
       throws ClassNotFoundException
    {
-      // Revert to standard rules
+      //    Revert to standard rules
       if (standard)
          return super.loadClass(className, resolve);
 
-      // Ask the parent
-      Class clazz = getParent().loadClass(className);
+      //    Ask the parent
+      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
+      //    Link the class
       if (resolve)
          resolveClass(clazz);
 

Modified: branches/JBoss_4_0_2_JBAS-3762/deployment/.project
===================================================================
--- branches/JBoss_4_0_2_JBAS-3762/deployment/.project	2006-10-13 14:42:11 UTC (rev 57657)
+++ branches/JBoss_4_0_2_JBAS-3762/deployment/.project	2006-10-13 15:08:20 UTC (rev 57658)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>JSR-88 Deployment</name>
+	<name>deployment</name>
 	<comment></comment>
 	<projects>
 		<project>common</project>