1.1 --- a/src/share/vm/classfile/classFileParser.cpp Wed May 14 15:01:08 2008 -0700
1.2 +++ b/src/share/vm/classfile/classFileParser.cpp Thu May 22 13:03:52 2008 -0400
1.3 @@ -44,6 +44,7 @@
1.4
1.5 // Used for backward compatibility reasons:
1.6 // - to check for javac bug fixes that happened after 1.5
1.7 +// - also used as the max version when running in jdk6
1.8 #define JAVA_6_VERSION 50
1.9
1.10
1.11 @@ -3516,9 +3517,11 @@
1.12 }
1.13
1.14 bool ClassFileParser::is_supported_version(u2 major, u2 minor) {
1.15 + u2 max_version = JDK_Version::is_gte_jdk17x_version() ?
1.16 + JAVA_MAX_SUPPORTED_VERSION : JAVA_6_VERSION;
1.17 return (major >= JAVA_MIN_SUPPORTED_VERSION) &&
1.18 - (major <= JAVA_MAX_SUPPORTED_VERSION) &&
1.19 - ((major != JAVA_MAX_SUPPORTED_VERSION) ||
1.20 + (major <= max_version) &&
1.21 + ((major != max_version) ||
1.22 (minor <= JAVA_MAX_SUPPORTED_MINOR_VERSION));
1.23 }
1.24
