# HG changeset patch
# User dcubed
# Date 1274908615 25200
# Node ID 3548f3198dca35aa4dc4c0e1883d413f8698218f
# Parent  c9a07413e82b59c31ff529a24706658cb2b0fa5b# Parent  e40a3601bc1fdec33b443458db92fc9aa9e563c9
Merge

diff -r c9a07413e82b -r 3548f3198dca src/share/vm/classfile/verifier.cpp
--- a/src/share/vm/classfile/verifier.cpp	Thu May 20 08:32:11 2010 -0700
+++ b/src/share/vm/classfile/verifier.cpp	Wed May 26 14:16:55 2010 -0700
@@ -25,6 +25,8 @@
 # include "incls/_precompiled.incl"
 # include "incls/_verifier.cpp.incl"
 
+#define NOFAILOVER_MAJOR_VERSION 51
+
 // Access to external entry for VerifyClassCodes - old byte code verifier
 
 extern "C" {
@@ -91,7 +93,8 @@
           klass, message_buffer, message_buffer_len, THREAD);
         split_verifier.verify_class(THREAD);
         exception_name = split_verifier.result();
-      if (FailOverToOldVerifier && !HAS_PENDING_EXCEPTION &&
+      if (klass->major_version() < NOFAILOVER_MAJOR_VERSION &&
+          FailOverToOldVerifier && !HAS_PENDING_EXCEPTION &&
           (exception_name == vmSymbols::java_lang_VerifyError() ||
            exception_name == vmSymbols::java_lang_ClassFormatError())) {
         if (TraceClassInitialization) {