Mercurial > hg > truffle
changeset 1124:2e8bdfdd3ba2
6899467: System property java.class.version out-of-sync with VM for jdk 5.0 with HS 16 in nightly build
Reviewed-by: kvn, never, dholmes, ysr
author | xlu |
---|---|
date | Wed, 16 Dec 2009 13:16:08 -0800 |
parents | dcb15a6f342d |
children | d48983315b71 933a3e806ce6 |
files | src/share/vm/classfile/classFileParser.cpp |
diffstat | 1 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/classfile/classFileParser.cpp Mon Dec 14 13:26:29 2009 -0700 +++ b/src/share/vm/classfile/classFileParser.cpp Wed Dec 16 13:16:08 2009 -0800 @@ -3766,8 +3766,9 @@ } bool ClassFileParser::is_supported_version(u2 major, u2 minor) { - u2 max_version = JDK_Version::is_gte_jdk17x_version() ? - JAVA_MAX_SUPPORTED_VERSION : JAVA_6_VERSION; + u2 max_version = + JDK_Version::is_gte_jdk17x_version() ? JAVA_MAX_SUPPORTED_VERSION : + (JDK_Version::is_gte_jdk16x_version() ? JAVA_6_VERSION : JAVA_1_5_VERSION); return (major >= JAVA_MIN_SUPPORTED_VERSION) && (major <= max_version) && ((major != max_version) ||