Mercurial > hg > openjdk > jdk6 > jdk
changeset 789:e5a4a4ec7b21
8014349: (cl) Class.getDeclaredClass problematic in some class loader configurations
Reviewed-by: mchung, ahgross, darcy
author | jfranck |
---|---|
date | Mon, 28 Oct 2013 21:46:43 +0000 |
parents | 42fd9f22ae5e |
children | 5e3c766d1809 |
files | src/share/classes/java/lang/Class.java src/share/native/java/lang/Class.c |
diffstat | 2 files changed, 12 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/classes/java/lang/Class.java Mon Oct 28 20:09:40 2013 +0000 +++ b/src/share/classes/java/lang/Class.java Mon Oct 28 21:46:43 2013 +0000 @@ -1093,7 +1093,17 @@ * @return the declaring class for this class * @since JDK1.1 */ - public native Class<?> getDeclaringClass(); + @CallerSensitive + public Class<?> getDeclaringClass() { + final Class<?> candidate = getDeclaringClass0(); + + if (candidate != null) + candidate.checkPackageAccess( + ClassLoader.getClassLoader(Reflection.getCallerClass()), true); + return candidate; + } + + private native Class<?> getDeclaringClass0(); /**
--- a/src/share/native/java/lang/Class.c Mon Oct 28 20:09:40 2013 +0000 +++ b/src/share/native/java/lang/Class.c Mon Oct 28 21:46:43 2013 +0000 @@ -70,7 +70,7 @@ {"getProtectionDomain0", "()" PD, (void *)&JVM_GetProtectionDomain}, {"setProtectionDomain0", "(" PD ")V", (void *)&JVM_SetProtectionDomain}, {"getDeclaredClasses0", "()[" CLS, (void *)&JVM_GetDeclaredClasses}, - {"getDeclaringClass", "()" CLS, (void *)&JVM_GetDeclaringClass}, + {"getDeclaringClass0", "()" CLS, (void *)&JVM_GetDeclaringClass}, {"getGenericSignature", "()" STR, (void *)&JVM_GetClassSignature}, {"getRawAnnotations", "()" BA, (void *)&JVM_GetClassAnnotations}, {"getConstantPool", "()" CPL, (void *)&JVM_GetClassConstantPool},