ObjectInputStream.java (callReadMethod): re-throw `ClassNotFoundException'.

2004-09-24  Casey Marshall <csm@gnu.org>

	* java/io/ObjectInputStream.java (callReadMethod): re-throw
	`ClassNotFoundException'.

From-SVN: r88023

libjava/ChangeLog

+2004-09-24  Casey Marshall <csm@gnu.org>
+
+	* java/io/ObjectInputStream.java (callReadMethod): re-throw
+	`ClassNotFoundException'.
+
 2004-09-24  Jeroen Frijters  <jeroen@frijters.net>
 
 	* java/io/ObjectInputStream.java (readObject): Delegate instantation

libjava/java/io/ObjectInputStream.java

@@ -1813,7 +1813,8 @@ public class ObjectInputStream extends InputStream
   
   private native ClassLoader getCallersClassLoader();
 
-  private void callReadMethod (Method readObject, Class klass, Object obj) throws IOException
+  private void callReadMethod (Method readObject, Class klass, Object obj)
+    throws ClassNotFoundException, IOException
   {
     try
       {
@@ -1827,6 +1828,8 @@ public class ObjectInputStream extends InputStream
 	  throw (RuntimeException) exception;
 	if (exception instanceof IOException)
 	  throw (IOException) exception;
+        if (exception instanceof ClassNotFoundException)
+          throw (ClassNotFoundException) exception;
 
 	throw new IOException("Exception thrown from readObject() on " +
 			       klass + ": " + exception.getClass().getName());