Merge branch '6.2.x'
This commit is contained in:
commit
1e83de072c
|
@ -1518,7 +1518,6 @@ public abstract class ClassUtils {
|
||||||
private static @Nullable Method findPubliclyAccessibleMethodIfPossible(
|
private static @Nullable Method findPubliclyAccessibleMethodIfPossible(
|
||||||
String methodName, Class<?>[] parameterTypes, Class<?> declaringClass) {
|
String methodName, Class<?>[] parameterTypes, Class<?> declaringClass) {
|
||||||
|
|
||||||
Method result = null;
|
|
||||||
Class<?> current = declaringClass.getSuperclass();
|
Class<?> current = declaringClass.getSuperclass();
|
||||||
while (current != null) {
|
while (current != null) {
|
||||||
Method method = getMethodOrNull(current, methodName, parameterTypes);
|
Method method = getMethodOrNull(current, methodName, parameterTypes);
|
||||||
|
@ -1528,11 +1527,11 @@ public abstract class ClassUtils {
|
||||||
if (Modifier.isPublic(method.getDeclaringClass().getModifiers()) &&
|
if (Modifier.isPublic(method.getDeclaringClass().getModifiers()) &&
|
||||||
method.getDeclaringClass().getModule().isExported(
|
method.getDeclaringClass().getModule().isExported(
|
||||||
method.getDeclaringClass().getPackageName(), ClassUtils.class.getModule())) {
|
method.getDeclaringClass().getPackageName(), ClassUtils.class.getModule())) {
|
||||||
result = method;
|
return method;
|
||||||
}
|
}
|
||||||
current = method.getDeclaringClass().getSuperclass();
|
current = method.getDeclaringClass().getSuperclass();
|
||||||
}
|
}
|
||||||
return result;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Reference in New Issue