Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
authorxlu
Wed, 16 Dec 2009 13:19:57 -0800
changeset 4495 b0a78f8af465
parent 4493 9204129f065e (current diff)
parent 4494 1f53dff2f6a5 (diff)
child 4498 513650e620ab
Merge
--- a/hotspot/src/share/vm/classfile/classFileParser.cpp	Wed Dec 16 12:54:49 2009 -0500
+++ b/hotspot/src/share/vm/classfile/classFileParser.cpp	Wed Dec 16 13:19:57 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) ||
jdk-sandbox