summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Wielaard <mark@klomp.org>2003-01-24 17:07:22 +0000
committerMark Wielaard <mark@klomp.org>2003-01-24 17:07:22 +0000
commitc5e9578906745e9113fdfd0faf000f0f5b1d16dd (patch)
tree5a29a5bee58101a20ebd03895540aa3cc84cfe8f
parent062f90aa4c8c0dfd1387a31af70b6ab09f4975a3 (diff)
downloadclasspath-c5e9578906745e9113fdfd0faf000f0f5b1d16dd.tar.gz
* java/io/ObjectOutputStream.java (writeObject): Rethrow fatal
ObjectStreamExceptions.
-rw-r--r--ChangeLog5
-rw-r--r--java/io/ObjectOutputStream.java5
2 files changed, 10 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index f50e3cf07..2d41dfa9f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-01-24 Mark Wielaard <mark@klomp.org>
+
+ * java/io/ObjectOutputStream.java (writeObject): Rethrow fatal
+ ObjectStreamExceptions.
+
2003-01-19 Mark Wielaard <mark@klomp.org>
* java/io/ObjectOutputStream.java (writeObject): Reformat.
diff --git a/java/io/ObjectOutputStream.java b/java/io/ObjectOutputStream.java
index f340dd4a1..0cd45d50f 100644
--- a/java/io/ObjectOutputStream.java
+++ b/java/io/ObjectOutputStream.java
@@ -382,6 +382,11 @@ public class ObjectOutputStream extends OutputStream
throw new NotSerializableException (clazz.getName ());
} // end pseudo-loop
}
+ catch (ObjectStreamException ose)
+ {
+ // Rethrow these are fatal.
+ throw ose;
+ }
catch (IOException e)
{
realOutput.writeByte (TC_EXCEPTION);