Merge
authorhseigel
Tue, 02 Feb 2016 14:54:05 +0000
changeset 35912 679f5181ef91
parent 35910 73277e369d4b (current diff)
parent 35911 80dd27ae501c (diff)
child 35913 928548a43408
child 35917 463d67f86eaa
Merge
--- a/hotspot/src/share/vm/classfile/classFileParser.cpp	Tue Feb 02 13:06:40 2016 +0000
+++ b/hotspot/src/share/vm/classfile/classFileParser.cpp	Tue Feb 02 14:54:05 2016 +0000
@@ -4602,8 +4602,8 @@
       }
     } else if (major_gte_15) {
       // Class file version in the interval [JAVA_1_5_VERSION, JAVA_8_VERSION)
-      if (!is_public || is_static || is_final || is_synchronized ||
-          is_native || !is_abstract || is_strict) {
+      if (!is_public || is_private || is_protected || is_static || is_final ||
+          is_synchronized || is_native || !is_abstract || is_strict) {
         is_illegal = true;
       }
     } else {