--- old/src/share/vm/prims/jni.cpp	2015-04-15 12:03:16.642372812 -0700
+++ new/src/share/vm/prims/jni.cpp	2015-04-15 12:03:16.500362883 -0700
@@ -395,7 +395,7 @@
     // 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(),
@@ -3021,8 +3021,8 @@
     // The class should have been loaded (we have an instance of the class
     // passed in) so the method and signature should already be in the symbol
     // table.  If they're not there, the method doesn't exist.
-    TempNewSymbol  name = SymbolTable::probe(meth_name, meth_name_len);
-    TempNewSymbol  signature = SymbolTable::probe(meth_sig, (int)strlen(meth_sig));
+    TempNewSymbol name = SymbolTable::probe(meth_name, meth_name_len);
+    TempNewSymbol signature = SymbolTable::probe(meth_sig, (int)strlen(meth_sig));
 
     if (name == NULL || signature == NULL) {
       ResourceMark rm;