stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8034962: Dynalink to handle superclasses more carefully

Browse Source 
Reviewed-by: ahgross, attila, jlaskey
This commit is contained in:
Athijegannathan Sundararajan 2014-02-21 10:31:40 +05:30
parent 1110a73114
commit ff64022738
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
nashorn/src/jdk/internal/dynalink/beans/AccessibleMembersLookup.java
View File

@ -211,7 +211,8 @@ class AccessibleMembersLookup {
if(!CheckRestrictedPackage.isRestrictedClass(clazz)) {
searchSuperTypes = false;
for(Method method: clazz.getMethods()) {
if(instance != Modifier.isStatic(method.getModifiers())) {
final boolean isStatic = Modifier.isStatic(method.getModifiers());
if(instance != isStatic) {
final MethodSignature sig = new MethodSignature(method);
if(!methods.containsKey(sig)) {
final Class<?> declaringClass = method.getDeclaringClass();
@ -228,7 +229,10 @@ class AccessibleMembersLookup {
//generate the said synthetic delegators.
searchSuperTypes = true;
} else {
methods.put(sig, method);
// don't allow inherited static
if (!isStatic || clazz == declaringClass) {
methods.put(sig, method);
}
}
}
}
@ -245,7 +249,8 @@ class AccessibleMembersLookup {
searchSuperTypes = true;
}
if(searchSuperTypes) {
// don't need to search super types for static methods
if(instance && searchSuperTypes) {
// If we reach here, the class is either not public, or it is in a restricted package. Alternatively, it is
// public, but some of its methods claim that their declaring class is non-public. We'll try superclasses
// and implemented interfaces then looking for public ones.

8
nashorn/src/jdk/internal/dynalink/beans/FacetIntrospector.java
View File

@ -136,7 +136,13 @@ abstract class FacetIntrospector {
final Field[] fields = clazz.getFields();
final Collection<Field> cfields = new ArrayList<>(fields.length);
for(Field field: fields) {
if(instance != Modifier.isStatic(field.getModifiers()) && isAccessible(field)) {
final boolean isStatic = Modifier.isStatic(field.getModifiers());
if(isStatic && clazz != field.getDeclaringClass()) {
// ignore inherited static fields
continue;
}
if(instance != isStatic && isAccessible(field)) {
cfields.add(field);
}
}