ClassLoader.java (loadClass): Call loadClass on VMClassLoader, not findClass.

	* java/lang/ClassLoader.java (loadClass): Call loadClass on
	VMClassLoader, not findClass.

From-SVN: r58786

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 8695a4acb2203a8c72f192be31270ee8690594de..1267d7683aea4c88c46fd0b9f0354255f4073033 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2002-11-03  Tom Tromey  <tromey@redhat.com>
+
+       * java/lang/ClassLoader.java (loadClass): Call loadClass on
+       VMClassLoader, not findClass.
+
 2002-11-03  Jeff Sturm  <jsturm@one-point.com>
 
        * resolve.cc (METHOD_NOT_THERE, METHOD_INACCESSIBLE): Remove.

diff --git a/libjava/java/lang/ClassLoader.java b/libjava/java/lang/ClassLoader.java
index 2c0e21133d961e6e926932369c91f055a6071883..1b3b310cab3b776d03223f5fdded61b751afcdf6 100644 (file)
--- a/libjava/java/lang/ClassLoader.java
+++ b/libjava/java/lang/ClassLoader.java
@@ -177,14 +177,18 @@ public abstract class ClassLoader
 
     if (c == null)
       {
-       try {
-         if (parent != null)
-           return parent.loadClass (name, link);
-         else
-           c = gnu.gcj.runtime.VMClassLoader.instance.findClass (name);
-       } catch (ClassNotFoundException ex) {
-         /* ignore, we'll try findClass */;
-       }
+       try
+         {
+           ClassLoader cl = parent;
+           if (parent == null)
+             cl = gnu.gcj.runtime.VMClassLoader.instance;
+           if (cl != this)
+             c = cl.loadClass (name, link);
+         }
+       catch (ClassNotFoundException ex)
+         {
+           /* ignore, we'll try findClass */;
+         }
       }
 
     if (c == null)