mauve-libgcj: Activated serialization tests.

	* mauve-libgcj: Activated serialization tests.
	* gcj/field.h (getModifiers): Mask off unknown flags.
	* gnu/java/security/provider/SHA.java (munch): Reset buffer to 0 so
	spurious bits don't cause discrepancies.
	* java/io/ObjectOutputStream.java: Fixed typo in comment.
	* java/io/ObjectStreamClass.java: Fixed typos in comments.
	(lookup): Applied patch from Brian Jones <cbj@gnu.org> to optimize.
	(hasClassInitializer): Call getDeclaredMethod instead of getMethod.
	* java/lang/Throwable.java (serialVersionUID): New field.
	* java/lang/reflect/Modifier.java (ALL_FLAGS): Preserve STRICT if used.
	* java/lang/reflect/natConstructor.cc (getModifiers): Mask off
	unknown flags.
	* java/lang/reflect/natMethod.cc: Ditto.
	* java/security/Key.java (serialVersionUID): Removed field for now.
	* java/security/interfaces/DSAPrivateKey.java (serialVersionUID): Ditto.
	* java/security/interfaces/DSAPublicKey.java (serialVersionUID): Ditto.

Serialization mods.

From-SVN: r35302

2 files changed, 8 insertions, 8 deletions

diff --git a/libjava/java/io/ObjectOutputStream.java b/libjava/java/io/ObjectOutputStream.java
index 23bcce4..a13f14a 100644
--- a/libjava/java/io/ObjectOutputStream.java
+++ b/libjava/java/io/ObjectOutputStream.java
@@ -54,7 +54,7 @@ import gnu.java.lang.reflect.TypeSignature;
 
    Using default serialization, information about the class of an
    object is written, all of the non-transient, non-static fields of
-   the object are written, if any of these fields are objects, the are
+   the object are written, if any of these fields are objects, they are
    written out in the same manner.
 
    An object is only written out the first time it is encountered.  If
diff --git a/libjava/java/io/ObjectStreamClass.java b/libjava/java/io/ObjectStreamClass.java
index c43112d..f39d365 100644
--- a/libjava/java/io/ObjectStreamClass.java
+++ b/libjava/java/io/ObjectStreamClass.java
@@ -1,6 +1,6 @@
 /* ObjectStreamClass.java -- Class used to write class information
    about 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.
 
@@ -51,7 +51,7 @@ public class ObjectStreamClass implements Serializable
   /**
      Returns the <code>ObjectStreamClass</code> for <code>cl</code>.
      If <code>cl</code> is null, or is not <code>Serializable</code>,
-     null is returned.  <code>ObjectStreamClass</code>'s are memoized;
+     null is returned.  <code>ObjectStreamClass</code>'s are memorized;
      later calls to this method with the same class will return the
      same <code>ObjectStreamClass</code> object and no recalculation
      will be done.
@@ -62,13 +62,13 @@ public class ObjectStreamClass implements Serializable
   {
     if (cl == null)
       return null;
+    if (! (Serializable.class).isAssignableFrom (cl))
+      return null;
 
     ObjectStreamClass osc = (ObjectStreamClass)classLookupTable.get (cl);
 
     if (osc != null)
       return osc;
-    else if (! (Serializable.class).isAssignableFrom (cl))
-      return null;
     else
     {
       osc = new ObjectStreamClass (cl);
@@ -161,7 +161,7 @@ public class ObjectStreamClass implements Serializable
   // private void writeObject (ObjectOutputStream)
   //
   // This method is used by the class to override default
-  // serialization behaivior.
+  // serialization behavior.
   boolean hasWriteMethod ()
   {
     return (flags & ObjectStreamConstants.SC_WRITE_METHOD) != 0;
@@ -396,7 +396,7 @@ public class ObjectStreamClass implements Serializable
     calculateOffsets ();
   }
 
-  // Sets uid be serial version UID defined by class, or if that
+  // Sets uid to be serial version UID defined by class, or if that
   // isn't present, calculates value of serial version UID.
   private void setUID (Class cl)
   {
@@ -603,7 +603,7 @@ public class ObjectStreamClass implements Serializable
     try
       {
 	Class classArgs[] = {};
-	m = clazz.getMethod ("<clinit>", classArgs);
+	m = clazz.getDeclaredMethod ("<clinit>", classArgs);
       }
     catch (java.lang.NoSuchMethodException e)
       {