changeset 1125:d48983315b71

Merge
author xlu
date Wed, 16 Dec 2009 13:19:57 -0800
parents 167c2986d91b 2e8bdfdd3ba2
children 6952ed8677bf
files
diffstat 1 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/vm/classfile/classFileParser.cpp	Wed Dec 16 12:54:49 2009 -0500
+++ b/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) ||