Mercurial > hg > openjdk > lambda > hotspot
changeset 5720:066778844ed9
Merge
| author | jprovino |
|---|---|
| date | Sun, 27 Oct 2013 14:11:06 -0400 |
| parents | 0dcdec729cda (current diff) 292050e5d5ea (diff) |
| children | f2f9139ccde9 |
| files | |
| diffstat | 2 files changed, 1 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/classfile/systemDictionary.hpp Fri Oct 25 08:38:42 2013 -0700 +++ b/src/share/vm/classfile/systemDictionary.hpp Sun Oct 27 14:11:06 2013 -0400 @@ -173,8 +173,6 @@ /* It's okay if this turns out to be NULL in non-1.4 JDKs. */ \ do_klass(nio_Buffer_klass, java_nio_Buffer, Opt ) \ \ - do_klass(PostVMInitHook_klass, sun_misc_PostVMInitHook, Opt ) \ - \ /* Preload boxing klasses */ \ do_klass(Boolean_klass, java_lang_Boolean, Pre ) \ do_klass(Character_klass, java_lang_Character, Pre ) \
--- a/src/share/vm/runtime/thread.cpp Fri Oct 25 08:38:42 2013 -0700 +++ b/src/share/vm/runtime/thread.cpp Sun Oct 27 14:11:06 2013 -0400 @@ -1097,7 +1097,7 @@ // General purpose hook into Java code, run once when the VM is initialized. // The Java library method itself may be changed independently from the VM. static void call_postVMInitHook(TRAPS) { - Klass* k = SystemDictionary::PostVMInitHook_klass(); + Klass* k = SystemDictionary::resolve_or_null(vmSymbols::sun_misc_PostVMInitHook(), THREAD); instanceKlassHandle klass (THREAD, k); if (klass.not_null()) { JavaValue result(T_VOID);