diff options
| author | bryce <bryce@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-12-17 11:51:14 +0000 |
|---|---|---|
| committer | bryce <bryce@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-12-17 11:51:14 +0000 |
| commit | 853c504cfccd92c72738f0bf3eb63ba3071f36d1 (patch) | |
| tree | 32d4ea657f649cf017d02cbe381d6d234de4d561 | |
| parent | 2ddd2f62a25d26d8ad39b7670b174f25c7353b4f (diff) | |
| download | ppe42-gcc-853c504cfccd92c72738f0bf3eb63ba3071f36d1.tar.gz ppe42-gcc-853c504cfccd92c72738f0bf3eb63ba3071f36d1.zip | |
* java/util/ArrayList.java (data): Declare transient.
(serialPersistantFields): Removed.
(readObject): Use defaultReadObject(), not readFields().
(writeObject): Use defaultWriteObject(), not writeFields().
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@38328 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | libjava/ChangeLog | 7 | ||||
| -rw-r--r-- | libjava/java/util/ArrayList.java | 20 |
2 files changed, 13 insertions, 14 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 7d601646d35..b19f7dcb163 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,10 @@ +2000-12-17 Bryce McKinlay <bryce@albatross.co.nz> + + * java/util/ArrayList.java (data): Declare transient. + (serialPersistantFields): Removed. + (readObject): Use defaultReadObject(), not readFields(). + (writeObject): Use defaultWriteObject(), not writeFields(). + 2000-12-17 Jeff Sturm <jeff.sturm@commerceone.com> * java/util/Hashtable.java (put): Remove `last' variable. diff --git a/libjava/java/util/ArrayList.java b/libjava/java/util/ArrayList.java index d440cdaec52..ba9c2d144b3 100644 --- a/libjava/java/util/ArrayList.java +++ b/libjava/java/util/ArrayList.java @@ -33,9 +33,6 @@ import java.io.Serializable; import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; -import java.io.ObjectInputStream.GetField; -import java.io.ObjectOutputStream.PutField; -import java.io.ObjectStreamField; /** * An array-backed implementation of the List interface. ArrayList @@ -43,7 +40,7 @@ import java.io.ObjectStreamField; * to or removing from the end of a list, checking the size, &c. * * @author Jon A. Zeppieri - * @version $Id: ArrayList.java,v 1.4 2000/11/22 11:59:59 bryce Exp $ + * @version $Id: ArrayList.java,v 1.12 2000/12/17 07:54:39 cbj Exp $ * @see java.util.AbstractList * @see java.util.List */ @@ -57,11 +54,7 @@ public class ArrayList extends AbstractList int size; /** where the data is stored */ - Object[] data; - - /** used for serialization -- denotes which fields are serialized */ - private static final ObjectStreamField[] serialPersistentFields = - { new ObjectStreamField("size", int.class) }; + transient Object[] data; /** * Construct a new ArrayList with the supplied initial capacity. @@ -398,9 +391,8 @@ public class ArrayList extends AbstractList { int i; - ObjectOutputStream.PutField fields = out.putFields(); - fields.put("size", size); - out.writeFields(); + // The 'size' field. + out.defaultWriteObject(); // FIXME: Do we really want to serialize unused list entries?? out.writeInt(data.length); @@ -414,8 +406,8 @@ public class ArrayList extends AbstractList int i; int capacity; - ObjectInputStream.GetField fields = in.readFields(); - size = fields.get("size", 0); + // the `size' field. + in.defaultReadObject(); capacity = in.readInt(); data = new Object[capacity]; |
