# HG changeset patch
# User xlu
# Date 1260998168 28800
# Node ID 2e8bdfdd3ba2101b2d6f9ae84ee86929e782a693
# Parent  dcb15a6f342de12f335600391af5f5f8328bca48
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

diff -r dcb15a6f342d -r 2e8bdfdd3ba2 src/share/vm/classfile/classFileParser.cpp
--- 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) ||