# HG changeset patch
# User xlu
# Date 1260998397 28800
# Node ID d48983315b71d4f96880a906cf253d59c4ce2749
# Parent  167c2986d91b8499b5658e69b6e7a9e09b444d91# Parent  2e8bdfdd3ba2101b2d6f9ae84ee86929e782a693
Merge

diff -r 167c2986d91b -r d48983315b71 src/share/vm/classfile/classFileParser.cpp
--- 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) ||