diff options
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/java/io/ObjectInputStream.java | 5 |
2 files changed, 9 insertions, 1 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index a6807ec..291f8d4 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +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 diff --git a/libjava/java/io/ObjectInputStream.java b/libjava/java/io/ObjectInputStream.java index b9bba27..5335dfa 100644 --- a/libjava/java/io/ObjectInputStream.java +++ b/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()); |