Mercurial > hg > graal-jvmci-8

diff src/share/vm/classfile/classFileParser.cpp @ 1129:a5a6adfca6ec hs17-b06 jdk7-b79

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author trims
date Wed, 23 Dec 2009 03:12:16 -0800
parents 85f13cdfbc1d 2e8bdfdd3ba2
children 9b9c1ee9b3f6
line wrap: on
line diff
--- a/src/share/vm/classfile/classFileParser.cpp	Wed Dec 23 02:57:31 2009 -0800
+++ b/src/share/vm/classfile/classFileParser.cpp	Wed Dec 23 03:12:16 2009 -0800
@@ -3755,8 +3755,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) ||