1.1 --- a/src/share/vm/oops/method.cpp Tue May 14 17:33:07 2013 +0000 1.2 +++ b/src/share/vm/oops/method.cpp Thu May 16 13:47:55 2013 -0700 1.3 @@ -832,7 +832,9 @@ 1.4 assert(entry != NULL, "interpreter entry must be non-null"); 1.5 // Sets both _i2i_entry and _from_interpreted_entry 1.6 set_interpreter_entry(entry); 1.7 - if (is_native() && !is_method_handle_intrinsic()) { 1.8 + 1.9 + // Don't overwrite already registered native entries. 1.10 + if (is_native() && !has_native_function()) { 1.11 set_native_function( 1.12 SharedRuntime::native_method_throw_unsatisfied_link_error_entry(), 1.13 !native_bind_event_is_interesting);