diff options
| author | Warren Levy <warrenl@cygnus.com> | 2000-08-04 00:42:20 +0000 |
|---|---|---|
| committer | Warren Levy <warrenl@gcc.gnu.org> | 2000-08-04 00:42:20 +0000 |
| commit | 9b4773cbba17889649a50c84ba520c0bfca73ec5 (patch) | |
| tree | 8ab868484bc80edbae9a9b855c3efeebafc7bf00 /libjava/java/io/ObjectStreamClass.java | |
| parent | a1bcc528be03e3414d165af5303b771760cbf840 (diff) | |
| download | gcc-9b4773cbba17889649a50c84ba520c0bfca73ec5.zip gcc-9b4773cbba17889649a50c84ba520c0bfca73ec5.tar.gz gcc-9b4773cbba17889649a50c84ba520c0bfca73ec5.tar.bz2 | |
ObjectInputStream.java (readFields): Turn off readDataFromBlock while reading via GetField.
* java/io/ObjectInputStream.java (readFields): Turn off
readDataFromBlock while reading via GetField.
(GetField$1.get(String, Object)): Pass Class of default value to
getField.
(getField): Allow for null default values.
* java/io/ObjectOutputStream.java: Fixed typo in comment.
(PutField$1.put): Fixed calls of checkType in most of the put
methods to pass the correct parameter.
(PutField$1.put(String, Object)): Allow for null value arg.
(PutField$1.write): Turn off writeDataAsBlocks while writing via
PutField.
* java/io/ObjectStreamClass.java (serialPersistentFields): Fixed
typo in spec'ed field name.
(getSerialPersistentFields): Changed spelling of method to match
the correct spelling of the spec'ed field name.
More serialization fixes per Mauve errors.
From-SVN: r35468
Diffstat (limited to 'libjava/java/io/ObjectStreamClass.java')
| -rw-r--r-- | libjava/java/io/ObjectStreamClass.java | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libjava/java/io/ObjectStreamClass.java b/libjava/java/io/ObjectStreamClass.java index f39d365..5bd867f 100644 --- a/libjava/java/io/ObjectStreamClass.java +++ b/libjava/java/io/ObjectStreamClass.java @@ -350,15 +350,15 @@ public class ObjectStreamClass implements Serializable try { - Field serialPersistantFields - = cl.getDeclaredField ("serialPersistantFields"); - int modifiers = serialPersistantFields.getModifiers (); + Field serialPersistentFields + = cl.getDeclaredField ("serialPersistentFields"); + int modifiers = serialPersistentFields.getModifiers (); if (Modifier.isStatic (modifiers) && Modifier.isFinal (modifiers) && Modifier.isPrivate (modifiers)) { - fields = getSerialPersistantFields (cl); + fields = getSerialPersistentFields (cl); Arrays.sort (fields); calculateOffsets (); return; @@ -569,15 +569,15 @@ public class ObjectStreamClass implements Serializable } // Returns the value of CLAZZ's private static final field named - // `serialPersistantFields'. - private ObjectStreamField[] getSerialPersistantFields (Class clazz) + // `serialPersistentFields'. + private ObjectStreamField[] getSerialPersistentFields (Class clazz) { ObjectStreamField[] o = null; try { // Use getDeclaredField rather than getField for the same reason // as above in getDefinedSUID. - Field f = clazz.getDeclaredField ("getSerialPersistantFields"); + Field f = clazz.getDeclaredField ("getSerialPersistentFields"); o = (ObjectStreamField[])f.get (null); } catch (java.lang.NoSuchFieldException e) |