FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

mauve-libgcj: Activated serialization tests.

Browse source 
* 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
This commit is contained in:
Warren Levy 2000-07-27 23:57:07 +00:00 • committed by Warren Levy
parent b2244c65f5
commit 7db51521a0
13 changed files with 50 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

14
libjava/java/io/ObjectStreamClass.java
View file

@ -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)
{