[jboss-svn-commits] JBoss Common SVN: r2377 - in common-old/branches/JBossCommon_1_0_0_GA_CP: tools/etc/buildmagic and 1 other directory.

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

Author: darran.lofthouse at jboss.com
Date: 2007-04-24 05:11:43 -0400 (Tue, 24 Apr 2007)
New Revision: 2377

Modified:
   common-old/branches/JBossCommon_1_0_0_GA_CP/src/main/org/jboss/util/loading/DelegatingClassLoader.java
   common-old/branches/JBossCommon_1_0_0_GA_CP/tools/etc/buildmagic/buildmagic.ent
Log:
ASPATCH-192 - NoClassDefFoundError performing remote lookup of dynamic proxy using IBM JDK.

Modified: common-old/branches/JBossCommon_1_0_0_GA_CP/src/main/org/jboss/util/loading/DelegatingClassLoader.java
===================================================================
--- common-old/branches/JBossCommon_1_0_0_GA_CP/src/main/org/jboss/util/loading/DelegatingClassLoader.java	2007-04-20 20:19:43 UTC (rev 2376)
+++ common-old/branches/JBossCommon_1_0_0_GA_CP/src/main/org/jboss/util/loading/DelegatingClassLoader.java	2007-04-24 09:11:43 UTC (rev 2377)
@@ -36,11 +36,11 @@
  * @author <a href="mailto:adrian at jboss.org">Adrian Brock</a>
  * @version $Revision$
  */
-public class DelegatingClassLoader
-   extends URLClassLoader
+public class DelegatingClassLoader extends URLClassLoader
 {
    /** The value returned by {@link getURLs}. */
-   public static final URL[] EMPTY_URL_ARRAY = {};
+   public static final URL[] EMPTY_URL_ARRAY =
+   {};
 
    /** Whether to use standard loading */
    protected boolean standard = false;
@@ -78,17 +78,28 @@
     * @return the loaded class
     * @throws ClassNotFoundException when the class could not be found
     */
-   protected Class loadClass(String className, boolean resolve)
-      throws ClassNotFoundException
+   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: common-old/branches/JBossCommon_1_0_0_GA_CP/tools/etc/buildmagic/buildmagic.ent
===================================================================
--- common-old/branches/JBossCommon_1_0_0_GA_CP/tools/etc/buildmagic/buildmagic.ent	2007-04-20 20:19:43 UTC (rev 2376)
+++ common-old/branches/JBossCommon_1_0_0_GA_CP/tools/etc/buildmagic/buildmagic.ent	2007-04-24 09:11:43 UTC (rev 2377)
@@ -103,10 +103,10 @@
   <property name="version.major" value="1"/>
   <property name="version.minor" value="0"/>
   <property name="version.revision" value="0"/>
-  <property name="version.tag" value="GA"/>
+  <property name="version.tag" value="GA_CP01"/>
   <property name="version.name" value="Zion"/>
   <!-- This must be set to the CVS tag for any release -->
-  <property name="version.cvstag" value="Branch_1_0"/>
+  <property name="version.cvstag" value="JBossCommon_1_0_0_GA_CP01"/>
 
   <!-- Manifest version info -->
   <property name="specification.title" value="JBoss Common"/>