aboutsummaryrefslogtreecommitdiff
path: root/libjava/java/lang/ClassLoader.java
diff options
context:
space:
mode:
Diffstat (limited to 'libjava/java/lang/ClassLoader.java')
-rw-r--r--libjava/java/lang/ClassLoader.java18
1 files changed, 12 insertions, 6 deletions
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;
}
}
}