diff options
| author | Guilhem Lavaux <guilhem@kaffe.org> | 2003-12-23 22:06:01 +0000 |
|---|---|---|
| committer | Michael Koch <mkoch@gcc.gnu.org> | 2003-12-23 22:06:01 +0000 |
| commit | 692fb023ef14a4690ee766c0596306353175aeec (patch) | |
| tree | cf9911a00c5d1b39db4f88ffc6c7f626cad43bf9 /libjava/java/io/ObjectOutputStream.java | |
| parent | f2073745a81b0687b24f40c1549769be5917987f (diff) | |
| download | gcc-692fb023ef14a4690ee766c0596306353175aeec.zip gcc-692fb023ef14a4690ee766c0596306353175aeec.tar.gz gcc-692fb023ef14a4690ee766c0596306353175aeec.tar.bz2 | |
2003-12-23 Guilhem Lavaux <guilhem@kaffe.org>
* 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
Diffstat (limited to 'libjava/java/io/ObjectOutputStream.java')
| -rw-r--r-- | libjava/java/io/ObjectOutputStream.java | 3 |
1 files changed, 2 insertions, 1 deletions
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); |