1.1 --- a/src/share/vm/prims/nativeLookup.cpp Thu Oct 03 12:39:58 2013 +0400
1.2 +++ b/src/share/vm/prims/nativeLookup.cpp Wed Oct 02 09:18:56 2013 -0700
1.3 @@ -129,10 +129,6 @@
1.4 #define FN_PTR(f) CAST_FROM_FN_PTR(void*, &f)
1.5
1.6 static JNINativeMethod lookup_special_native_methods[] = {
1.7 - // Next two functions only exist for compatibility with 1.3.1 and earlier.
1.8 - { CC"Java_java_io_ObjectOutputStream_getPrimitiveFieldValues", NULL, FN_PTR(JVM_GetPrimitiveFieldValues) }, // intercept ObjectOutputStream getPrimitiveFieldValues for faster serialization
1.9 - { CC"Java_java_io_ObjectInputStream_setPrimitiveFieldValues", NULL, FN_PTR(JVM_SetPrimitiveFieldValues) }, // intercept ObjectInputStream setPrimitiveFieldValues for faster serialization
1.10 -
1.11 { CC"Java_sun_misc_Unsafe_registerNatives", NULL, FN_PTR(JVM_RegisterUnsafeMethods) },
1.12 { CC"Java_java_lang_invoke_MethodHandleNatives_registerNatives", NULL, FN_PTR(JVM_RegisterMethodHandleMethods) },
1.13 { CC"Java_sun_misc_Perf_registerNatives", NULL, FN_PTR(JVM_RegisterPerfMethods) },
1.14 @@ -140,9 +136,8 @@
1.15 };
1.16
1.17 static address lookup_special_native(char* jni_name) {
1.18 - int i = !JDK_Version::is_gte_jdk14x_version() ? 0 : 2; // see comment in lookup_special_native_methods
1.19 int count = sizeof(lookup_special_native_methods) / sizeof(JNINativeMethod);
1.20 - for (; i < count; i++) {
1.21 + for (int i = 0; i < count; i++) {
1.22 // NB: To ignore the jni prefix and jni postfix strstr is used matching.
1.23 if (strstr(jni_name, lookup_special_native_methods[i].name) != NULL) {
1.24 return CAST_FROM_FN_PTR(address, lookup_special_native_methods[i].fnPtr);
