1.1 --- a/src/share/vm/prims/jni.cpp Fri Oct 05 13:37:08 2012 -0700
1.2 +++ b/src/share/vm/prims/jni.cpp Wed Oct 10 14:35:58 2012 -0400
1.3 @@ -3003,9 +3003,9 @@
1.4 HOTSPOT_JNI_GETSTATICOBJECTFIELD_ENTRY(
1.5 env, clazz, (uintptr_t) fieldID);
1.6 #endif /* USDT2 */
1.7 -#ifndef JNICHECK_KERNEL
1.8 +#if INCLUDE_JNI_CHECK
1.9 DEBUG_ONLY(Klass* param_k = jniCheck::validate_class(thread, clazz);)
1.10 -#endif // JNICHECK_KERNEL
1.11 +#endif // INCLUDE_JNI_CHECK
1.12 JNIid* id = jfieldIDWorkaround::from_static_jfieldID(fieldID);
1.13 assert(id->is_static_field_id(), "invalid static field id");
1.14 // Keep JVMTI addition small and only check enabled flag here.
1.15 @@ -3951,6 +3951,7 @@
1.16 // SetNativeMethodPrefix(es) functions in the JVM TI Spec for details.
1.17 static Method* find_prefixed_native(KlassHandle k,
1.18 Symbol* name, Symbol* signature, TRAPS) {
1.19 +#if INCLUDE_JVMTI
1.20 ResourceMark rm(THREAD);
1.21 Method* method;
1.22 int name_len = name->utf8_length();
1.23 @@ -3982,6 +3983,7 @@
1.24 name_len = trial_len;
1.25 name_str = trial_name_str;
1.26 }
1.27 +#endif // INCLUDE_JVMTI
1.28 return NULL; // not found
1.29 }
1.30
1.31 @@ -4975,11 +4977,9 @@
1.32
1.33 // Returns the function structure
1.34 struct JNINativeInterface_* jni_functions() {
1.35 -#ifndef JNICHECK_KERNEL
1.36 +#if INCLUDE_JNI_CHECK
1.37 if (CheckJNICalls) return jni_functions_check();
1.38 -#else // JNICHECK_KERNEL
1.39 - if (CheckJNICalls) warning("-Xcheck:jni is not supported in kernel vm.");
1.40 -#endif // JNICHECK_KERNEL
1.41 +#endif // INCLUDE_JNI_CHECK
1.42 return &jni_NativeInterface;
1.43 }
1.44
