* 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.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@35468 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 7 insertions, 7 deletions

diff --git a/libjava/java/io/ObjectStreamClass.java b/libjava/java/io/ObjectStreamClass.java
index f39d365ad27..5bd867fa5ee 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)