comparison src/share/vm/classfile/classFileParser.cpp @ 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 74a5db69c1fe
children a5a6adfca6ec
comparison
equal deleted inserted replaced
1122:dcb15a6f342d 1124:2e8bdfdd3ba2
3764 (is_public && is_private) || 3764 (is_public && is_private) ||
3765 (is_protected && is_private)); 3765 (is_protected && is_private));
3766 } 3766 }
3767 3767
3768 bool ClassFileParser::is_supported_version(u2 major, u2 minor) { 3768 bool ClassFileParser::is_supported_version(u2 major, u2 minor) {
3769 u2 max_version = JDK_Version::is_gte_jdk17x_version() ? 3769 u2 max_version =
3770 JAVA_MAX_SUPPORTED_VERSION : JAVA_6_VERSION; 3770 JDK_Version::is_gte_jdk17x_version() ? JAVA_MAX_SUPPORTED_VERSION :
3771 (JDK_Version::is_gte_jdk16x_version() ? JAVA_6_VERSION : JAVA_1_5_VERSION);
3771 return (major >= JAVA_MIN_SUPPORTED_VERSION) && 3772 return (major >= JAVA_MIN_SUPPORTED_VERSION) &&
3772 (major <= max_version) && 3773 (major <= max_version) &&
3773 ((major != max_version) || 3774 ((major != max_version) ||
3774 (minor <= JAVA_MAX_SUPPORTED_MINOR_VERSION)); 3775 (minor <= JAVA_MAX_SUPPORTED_MINOR_VERSION));
3775 } 3776 }