From 692fb023ef14a4690ee766c0596306353175aeec Mon Sep 17 00:00:00 2001 From: Guilhem Lavaux Date: Tue, 23 Dec 2003 22:06:01 +0000 Subject: 2003-12-23 Guilhem Lavaux * java/io/ObjectInputStream.java (getField): Handle transient and non persistent fields. (readClassDescriptor): Better error handling, use the right class loader. (readFields): Fields marked as not present in the stream or not to be set are not read and set. * java/io/ObjectInputStream.java (readFields): Changed implementation of GetField. (readClassDescriptor): Documented. * java/io/ObjectOutputStream.java (writeClassDescriptor): Added condition when to write class super class information. From-SVN: r74985 --- libjava/java/io/ObjectOutputStream.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'libjava/java/io/ObjectOutputStream.java') diff --git a/libjava/java/io/ObjectOutputStream.java b/libjava/java/io/ObjectOutputStream.java index f79ac3e..0244e2d 100644 --- a/libjava/java/io/ObjectOutputStream.java +++ b/libjava/java/io/ObjectOutputStream.java @@ -407,7 +407,8 @@ public class ObjectOutputStream extends OutputStream setBlockDataMode (oldmode); realOutput.writeByte (TC_ENDBLOCKDATA); - if (osc.isSerializable ()) + if (osc.isSerializable() + || osc.isExternalizable()) writeObject (osc.getSuper ()); else writeObject (null); -- cgit v1.1