From 629a2d2b25f27fb92f75aba454d5e75dd23550b6 Mon Sep 17 00:00:00 2001
From: Casey Marshall <csm@gnu.org>
Date: Fri, 24 Sep 2004 09:31:28 +0000
Subject: [PATCH] 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 | 5 +++++
libjava/java/io/ObjectInputStream.java | 5 ++++-
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index a6807eccbcf1..291f8d4a05ce 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 b9bba27b09bd..5335dfa58514 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());
--
GitLab