From 7db51521a018eaa0751e5948091cfb29c841ca91 Mon Sep 17 00:00:00 2001 From: Warren Levy Date: Thu, 27 Jul 2000 23:57:07 +0000 Subject: 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 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 --- libjava/java/lang/Throwable.java | 1 + libjava/java/lang/reflect/Modifier.java | 2 +- libjava/java/lang/reflect/natConstructor.cc | 3 ++- libjava/java/lang/reflect/natMethod.cc | 3 ++- 4 files changed, 6 insertions(+), 3 deletions(-) (limited to 'libjava/java/lang') diff --git a/libjava/java/lang/Throwable.java b/libjava/java/lang/Throwable.java index 1a0876f..610a499 100644 --- a/libjava/java/lang/Throwable.java +++ b/libjava/java/lang/Throwable.java @@ -165,4 +165,5 @@ public class Throwable implements Serializable private String detailMessage; private transient byte stackTrace[]; + private static final long serialVersionUID = -3042686055658047285L; } diff --git a/libjava/java/lang/reflect/Modifier.java b/libjava/java/lang/reflect/Modifier.java index 14b0da3..5fddbc6 100644 --- a/libjava/java/lang/reflect/Modifier.java +++ b/libjava/java/lang/reflect/Modifier.java @@ -37,7 +37,7 @@ public class Modifier public static final int STRICT = 0x800; // This is only used by the C++ code, so it is not public. - static final int ALL_FLAGS = 0x7ff; + static final int ALL_FLAGS = 0xfff; public static boolean isAbstract (int mod) { diff --git a/libjava/java/lang/reflect/natConstructor.cc b/libjava/java/lang/reflect/natConstructor.cc index 48f5aa3..a8da794 100644 --- a/libjava/java/lang/reflect/natConstructor.cc +++ b/libjava/java/lang/reflect/natConstructor.cc @@ -23,7 +23,8 @@ details. */ jint java::lang::reflect::Constructor::getModifiers () { - return _Jv_FromReflectedConstructor (this)->accflags; + // Ignore all unknown flags. + return _Jv_FromReflectedConstructor (this)->accflags & Modifier::ALL_FLAGS; } void diff --git a/libjava/java/lang/reflect/natMethod.cc b/libjava/java/lang/reflect/natMethod.cc index 0cee80b..ce4a15c 100644 --- a/libjava/java/lang/reflect/natMethod.cc +++ b/libjava/java/lang/reflect/natMethod.cc @@ -182,7 +182,8 @@ java::lang::reflect::Method::invoke (jobject obj, jobjectArray args) jint java::lang::reflect::Method::getModifiers () { - return _Jv_FromReflectedMethod (this)->accflags; + // Ignore all unknown flags. + return _Jv_FromReflectedMethod (this)->accflags & Modifier::ALL_FLAGS; } jstring -- cgit v1.1