Commit 629a2d2b by Casey Marshall Committed by Michael Koch

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
parent 73eb1309
2004-09-24 Casey Marshall <csm@gnu.org>
* java/io/ObjectInputStream.java (callReadMethod): re-throw
`ClassNotFoundException'.
2004-09-24 Jeroen Frijters <jeroen@frijters.net> 2004-09-24 Jeroen Frijters <jeroen@frijters.net>
* java/io/ObjectInputStream.java (readObject): Delegate instantation * java/io/ObjectInputStream.java (readObject): Delegate instantation
......
...@@ -1813,7 +1813,8 @@ public class ObjectInputStream extends InputStream ...@@ -1813,7 +1813,8 @@ public class ObjectInputStream extends InputStream
private native ClassLoader getCallersClassLoader(); 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 try
{ {
...@@ -1827,6 +1828,8 @@ public class ObjectInputStream extends InputStream ...@@ -1827,6 +1828,8 @@ public class ObjectInputStream extends InputStream
throw (RuntimeException) exception; throw (RuntimeException) exception;
if (exception instanceof IOException) if (exception instanceof IOException)
throw (IOException) exception; throw (IOException) exception;
if (exception instanceof ClassNotFoundException)
throw (ClassNotFoundException) exception;
throw new IOException("Exception thrown from readObject() on " + throw new IOException("Exception thrown from readObject() on " +
klass + ": " + exception.getClass().getName()); klass + ": " + exception.getClass().getName());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment