# HG changeset patch # User Doug Simon # Date 1372431626 -7200 # Node ID e376b764fdc723a4222124a0e86707ea71ccaf56 # Parent 6b9ebfcf5fc529245f7e46e9552cab6a0968ef32 fixed non-product builds of the VM for jdk7_25 diff -r 6b9ebfcf5fc5 -r e376b764fdc7 src/share/vm/prims/jvm.cpp --- a/src/share/vm/prims/jvm.cpp Fri Jun 28 15:32:06 2013 +0200 +++ b/src/share/vm/prims/jvm.cpp Fri Jun 28 17:00:26 2013 +0200 @@ -671,7 +671,7 @@ JVMWrapper("JVM_GetCallerClass"); // Pre-JDK 8 and early builds of JDK 8 don't have a CallerSensitive annotation. - if (SystemDictionary::reflect_CallerSensitive_klass() == NULL) { + if (!JDK_Version::is_gte_jdk18x_version() || SystemDictionary::reflect_CallerSensitive_klass() == NULL) { Klass* k = thread->security_get_caller_class(depth); return (k == NULL) ? NULL : (jclass) JNIHandles::make_local(env, k->java_mirror()); } else {