diff options
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 6 | ||||
| -rw-r--r-- | libjava/java/io/ObjectOutputStream.java | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index bd8c7fbd648..165b56d3358 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,9 @@ +2000-05-24 Warren Levy <warrenl@cygnus.com> + + * java/io/ObjectOutputStream.java (writeObject): Use component type + when writing arrays. + Fixed typo. + 2000-05-20 Bryce McKinlay <bryce@albatross.co.nz> Fix for PR libgcj/226: diff --git a/libjava/java/io/ObjectOutputStream.java b/libjava/java/io/ObjectOutputStream.java index a98b55baf19..23bcce49d76 100644 --- a/libjava/java/io/ObjectOutputStream.java +++ b/libjava/java/io/ObjectOutputStream.java @@ -1,5 +1,5 @@ /* ObjectOutputStream.java -- Class used to write serialized objects - Copyright (C) 1998, 1999 Free Software Foundation, Inc. + Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -276,7 +276,7 @@ public class ObjectOutputStream extends OutputStream realOutput.writeByte (TC_ARRAY); writeObject (osc); assignNewHandle (obj); - writeArraySizeAndElements (obj, clazz); + writeArraySizeAndElements (obj, clazz.getComponentType ()); break; } @@ -395,7 +395,7 @@ public class ObjectOutputStream extends OutputStream throw new NotActiveException ("defaultWriteObject called by non-active class and/or object"); if (fieldsAlreadyWritten) - throw new IOException ("Only one of putFields and defalutWriteObject may be called, and it may only be called once"); + throw new IOException ("Only one of putFields and defaultWriteObject may be called, and it may only be called once"); fieldsAlreadyWritten = true; } |
