aboutsummaryrefslogtreecommitdiff
path: root/libjava
diff options
context:
space:
mode:
authorWarren Levy <warrenl@cygnus.com>2000-05-24 21:15:51 +0000
committerWarren Levy <warrenl@gcc.gnu.org>2000-05-24 21:15:51 +0000
commit0d0cd4416983022d5bd65c29b4368069f55684d6 (patch)
tree559512ab24a4189c7e84661f14d5c55ab61ae382 /libjava
parentba34d877f6f1a2e1cdc166ec41f495d0ebb7911e (diff)
downloadgcc-0d0cd4416983022d5bd65c29b4368069f55684d6.zip
gcc-0d0cd4416983022d5bd65c29b4368069f55684d6.tar.gz
gcc-0d0cd4416983022d5bd65c29b4368069f55684d6.tar.bz2
ObjectOutputStream.java (writeObject): Use component type when writing arrays.
* java/io/ObjectOutputStream.java (writeObject): Use component type when writing arrays. Fixed typo. From-SVN: r34142
Diffstat (limited to 'libjava')
-rw-r--r--libjava/ChangeLog6
-rw-r--r--libjava/java/io/ObjectOutputStream.java6
2 files changed, 9 insertions, 3 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index bd8c7fb..165b56d 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 a98b55ba..23bcce4 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;
}