summaryrefslogtreecommitdiffstats
path: root/libjava/java/lang
diff options
context:
space:
mode:
Diffstat (limited to 'libjava/java/lang')
-rw-r--r--libjava/java/lang/Throwable.java1
-rw-r--r--libjava/java/lang/reflect/Modifier.java2
-rw-r--r--libjava/java/lang/reflect/natConstructor.cc3
-rw-r--r--libjava/java/lang/reflect/natMethod.cc3
4 files changed, 6 insertions, 3 deletions
diff --git a/libjava/java/lang/Throwable.java b/libjava/java/lang/Throwable.java
index 1a0876fce3f..610a499a2cb 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 14b0da3f095..5fddbc695e4 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 48f5aa345d1..a8da794bdb8 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 0cee80b1ddf..ce4a15cfc17 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
OpenPOWER on IntegriCloud