OpenJDK / amber / amber
changeset 5684:f6538e83cf3b
Merge
| author | dcubed |
|---|---|
| date | Wed, 26 May 2010 14:16:55 -0700 |
| parents | c531522ec99a 116fea597b5d |
| children | 0e4c848d5c06 3b5307e27c1d d664086c0add |
| files | |
| diffstat | 1 files changed, 4 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/hotspot/src/share/vm/classfile/verifier.cpp Thu May 20 08:32:11 2010 -0700 +++ b/hotspot/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) {