From: Tom Tromey <tromey@redhat.com>
Date: Mon, 4 Nov 2002 06:17:55 +0000 (+0000)
Subject: ClassLoader.java (loadClass): Call loadClass on VMClassLoader, not findClass.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=957e3aef4c72448854b1d614f010c8006b8054fa;p=gcc.git

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 8695a4acb22..1267d7683ae 100644
--- 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 2c0e21133d9..1b3b310cab3 100644
--- 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)