diff options
| author | mkoch <mkoch@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-09-24 09:31:28 +0000 |
|---|---|---|
| committer | mkoch <mkoch@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-09-24 09:31:28 +0000 |
| commit | 669c47740dfea88391403afac5f1b5447b2cf9d2 (patch) | |
| tree | 1a65ee8126b1209459d263744cccc370d7e76870 /libjava | |
| parent | 881dfb65bfb4b3ed6d12eb0b9e6af30a9bb87015 (diff) | |
| download | ppe42-gcc-669c47740dfea88391403afac5f1b5447b2cf9d2.tar.gz ppe42-gcc-669c47740dfea88391403afac5f1b5447b2cf9d2.zip | |
2004-09-24 Casey Marshall <csm@gnu.org>
* 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
Diffstat (limited to 'libjava')
| -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 a6807eccbcf..291f8d4a05c 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 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()); |
