*** old/src/share/vm/prims/jni.cpp	Wed Apr 15 12:03:16 2015
--- new/src/share/vm/prims/jni.cpp	Wed Apr 15 12:03:16 2015

*** 393,403 ****
--- 393,403 ----
    if (k.not_null()) {
      loader = Handle(THREAD, k->class_loader());
      // Special handling to make sure JNI_OnLoad and JNI_OnUnload are executed
      // in the correct class context.
      if (loader.is_null() &&
!         k->name() == vmSymbols::java_lang_ClassLoader_NativeLibrary()) {
!         k->name()->equals(vmSymbols::java_lang_ClassLoader_NativeLibrary())) {
        JavaValue result(T_OBJECT);
        JavaCalls::call_static(&result, k,
                                        vmSymbols::getFromClass_name(),
                                        vmSymbols::void_class_signature(),
                                        thread);