git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Casey Marshall 2004-09-24 09:31:28 +00:00 committed by Michael Koch
parent 73eb130916
commit 629a2d2b25
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libjava/ChangeLog
View File

@ -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> 2004-09-24 Jeroen Frijters <jeroen@frijters.net>
* java/io/ObjectInputStream.java (readObject): Delegate instantation * java/io/ObjectInputStream.java (readObject): Delegate instantation

5
libjava/java/io/ObjectInputStream.java
View File

@ -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
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());