diff options
| author | Warren Levy <warrenl@redhat.com> | 2000-08-04 00:45:13 +0000 |
|---|---|---|
| committer | Warren Levy <warrenl@redhat.com> | 2000-08-04 00:45:13 +0000 |
| commit | a25f6e61c37f57fd47ff5d99627a42a78642100c (patch) | |
| tree | 4777e9a27297ccf630c9134fa8f957be38b4ad22 /java/io/ObjectStreamClass.java | |
| parent | 58dc0f222adcaabf051b3c43435fdaa0fdeb0379 (diff) | |
| download | classpath-a25f6e61c37f57fd47ff5d99627a42a78642100c.tar.gz | |
* 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.
* 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.
* 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 results.
Diffstat (limited to 'java/io/ObjectStreamClass.java')
| -rw-r--r-- | java/io/ObjectStreamClass.java | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/java/io/ObjectStreamClass.java b/java/io/ObjectStreamClass.java index 9182127d1..e8bd4b789 100644 --- a/java/io/ObjectStreamClass.java +++ b/java/io/ObjectStreamClass.java @@ -347,15 +347,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; @@ -553,15 +553,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) |