Mercurial > hg > truffle

comparison 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
comparison
equal deleted inserted replaced
10569:6b9ebfcf5fc5 10571:e376b764fdc7
669 669
670 JVM_ENTRY(jclass, JVM_GetCallerClass(JNIEnv* env, int depth)) 670 JVM_ENTRY(jclass, JVM_GetCallerClass(JNIEnv* env, int depth))
671 JVMWrapper("JVM_GetCallerClass"); 671 JVMWrapper("JVM_GetCallerClass");
672 672
673 // Pre-JDK 8 and early builds of JDK 8 don't have a CallerSensitive annotation. 673 // Pre-JDK 8 and early builds of JDK 8 don't have a CallerSensitive annotation.
674 if (SystemDictionary::reflect_CallerSensitive_klass() == NULL) { 674 if (!JDK_Version::is_gte_jdk18x_version() || SystemDictionary::reflect_CallerSensitive_klass() == NULL) {
675 Klass* k = thread->security_get_caller_class(depth); 675 Klass* k = thread->security_get_caller_class(depth);
676 return (k == NULL) ? NULL : (jclass) JNIHandles::make_local(env, k->java_mirror()); 676 return (k == NULL) ? NULL : (jclass) JNIHandles::make_local(env, k->java_mirror());
677 } else { 677 } else {
678 // Basic handshaking with Java_sun_reflect_Reflection_getCallerClass 678 // Basic handshaking with Java_sun_reflect_Reflection_getCallerClass
679 assert(depth == -1, "wrong handshake depth"); 679 assert(depth == -1, "wrong handshake depth");