From f0caaa23bf4184320da641eec159b0ef52ac337e Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Fri, 13 Dec 2002 10:04:15 +0000 Subject: ClassLoader.java (resolveClass0): Transform ClassNotFoundException to NoClassDefFoundError. * java/lang/ClassLoader.java (resolveClass0): Transform ClassNotFoundException to NoClassDefFoundError. Transform all other throwables to LinkageError. From-SVN: r60097 --- libjava/java/lang/ClassLoader.java | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) (limited to 'libjava/java') diff --git a/libjava/java/lang/ClassLoader.java b/libjava/java/lang/ClassLoader.java index 99acac6..033b2cc 100644 --- a/libjava/java/lang/ClassLoader.java +++ b/libjava/java/lang/ClassLoader.java @@ -535,16 +535,22 @@ public abstract class ClassLoader { markClassErrorState0 (clazz); - if (x instanceof Error) - throw (Error)x; + LinkageError e; + if (x instanceof LinkageError) + e = (LinkageError)x; + else if (x instanceof ClassNotFoundException) + { + e = new NoClassDefFoundError("while resolving class: " + + clazz.getName()); + e.initCause (x); + } else { - InternalError e - = new InternalError ("unexpected exception during linking: " - + clazz.getName()); + e = new LinkageError ("unexpected exception during linking: " + + clazz.getName()); e.initCause (x); - throw e; } + throw e; } } } -- cgit v1.1