Mercurial > hg > truffle

diff src/share/vm/prims/jvm.cpp @ 10571:e376b764fdc7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixed non-product builds of the VM for jdk7_25
author Doug Simon <doug.simon@oracle.com>
date Fri, 28 Jun 2013 17:00:26 +0200
parents 836a62f43af9
children 6b0fd0964b87
line wrap: on
line diff
--- 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 {