From 669c47740dfea88391403afac5f1b5447b2cf9d2 Mon Sep 17 00:00:00 2001 From: mkoch Date: Fri, 24 Sep 2004 09:31:28 +0000 Subject: 2004-09-24 Casey Marshall * java/io/ObjectInputStream.java (callReadMethod): re-throw `ClassNotFoundException'. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@88023 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/ChangeLog | 5 +++++ libjava/java/io/ObjectInputStream.java | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'libjava') diff --git a/libjava/ChangeLog b/libjava/ChangeLog index a6807eccbcf..291f8d4a05c 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2004-09-24 Casey Marshall + + * java/io/ObjectInputStream.java (callReadMethod): re-throw + `ClassNotFoundException'. + 2004-09-24 Jeroen Frijters * java/io/ObjectInputStream.java (readObject): Delegate instantation diff --git a/libjava/java/io/ObjectInputStream.java b/libjava/java/io/ObjectInputStream.java index b9bba27b09b..5335dfa5851 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()); -- cgit v1.2.3