From f0caaa23bf4184320da641eec159b0ef52ac337e Mon Sep 17 00:00:00 2001
From: Mark Wielaard <mark@klomp.org>
Date: Fri, 13 Dec 2002 10:04:15 +0000
Subject: [PATCH] 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/ChangeLog                  |  6 ++++++
 libjava/java/lang/ClassLoader.java | 18 ++++++++++++------
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 203230b6bd3..c07140dd412 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2002-12-12  Mark Wielaard  <mark@klomp.org>
+
+	* java/lang/ClassLoader.java (resolveClass0): Transform
+	ClassNotFoundException to NoClassDefFoundError. Transform all other
+	throwables to LinkageError.
+
 2002-12-11  Tom Tromey  <tromey@redhat.com>
 
 	* java/lang/ClassLoader.java (findLoadedClass): Now synchronized.
diff --git a/libjava/java/lang/ClassLoader.java b/libjava/java/lang/ClassLoader.java
index 99acac68bb5..033b2cc4a6e 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;
 	  }
       }
   }