From 957e3aef4c72448854b1d614f010c8006b8054fa Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Mon, 4 Nov 2002 06:17:55 +0000 Subject: ClassLoader.java (loadClass): Call loadClass on VMClassLoader, not findClass. * java/lang/ClassLoader.java (loadClass): Call loadClass on VMClassLoader, not findClass. From-SVN: r58786 --- libjava/java/lang/ClassLoader.java | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) (limited to 'libjava/java/lang') diff --git a/libjava/java/lang/ClassLoader.java b/libjava/java/lang/ClassLoader.java index 2c0e211..1b3b310 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) -- cgit v1.1