Thu, 24 Oct 2013 00:33:14 -0400
8026877: Error in opening JAR file when invalid jar specified with -Xbootclasspath/a on OpenJDK build
Reviewed-by: coleenp, twisti
src/share/vm/classfile/systemDictionary.hpp | file | annotate | diff | comparison | revisions | |
src/share/vm/runtime/thread.cpp | file | annotate | diff | comparison | revisions |
1.1 --- a/src/share/vm/classfile/systemDictionary.hpp Mon Oct 21 22:36:43 2013 -0400 1.2 +++ b/src/share/vm/classfile/systemDictionary.hpp Thu Oct 24 00:33:14 2013 -0400 1.3 @@ -173,8 +173,6 @@ 1.4 /* It's okay if this turns out to be NULL in non-1.4 JDKs. */ \ 1.5 do_klass(nio_Buffer_klass, java_nio_Buffer, Opt ) \ 1.6 \ 1.7 - do_klass(PostVMInitHook_klass, sun_misc_PostVMInitHook, Opt ) \ 1.8 - \ 1.9 /* Preload boxing klasses */ \ 1.10 do_klass(Boolean_klass, java_lang_Boolean, Pre ) \ 1.11 do_klass(Character_klass, java_lang_Character, Pre ) \
2.1 --- a/src/share/vm/runtime/thread.cpp Mon Oct 21 22:36:43 2013 -0400 2.2 +++ b/src/share/vm/runtime/thread.cpp Thu Oct 24 00:33:14 2013 -0400 2.3 @@ -1097,7 +1097,7 @@ 2.4 // General purpose hook into Java code, run once when the VM is initialized. 2.5 // The Java library method itself may be changed independently from the VM. 2.6 static void call_postVMInitHook(TRAPS) { 2.7 - Klass* k = SystemDictionary::PostVMInitHook_klass(); 2.8 + Klass* k = SystemDictionary::resolve_or_null(vmSymbols::sun_misc_PostVMInitHook(), THREAD); 2.9 instanceKlassHandle klass (THREAD, k); 2.10 if (klass.not_null()) { 2.11 JavaValue result(T_VOID);