admin/spring-projects-spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework synced 2026-06-08 17:33:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fall back to getPubliclyAccessibleMethodIfPossible on IllegalAccessException

Browse Source 
Closes gh-34028
This commit is contained in:
Juergen Hoeller
2025-07-11 22:41:50 +02:00
parent 5aa15923cf
commit c754bfe7e6
1 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-core/src/main/java/org/springframework/util/MethodInvoker.java
+22 -7
View File
@@ -16,6 +16,7 @@
package org.springframework.util;
import java.lang.reflect.InaccessibleObjectException;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
@@ -178,7 +179,8 @@ public class MethodInvoker {
Object[] arguments = getArguments();
Class<?>[] argTypes = new Class<?>[arguments.length];
for (int i = 0; i < arguments.length; ++i) {
argTypes[i] = (arguments[i] != null ? arguments[i].getClass() : Object.class);
Object argument = arguments[i];
argTypes[i] = (argument != null ? argument.getClass() : Object.class);
}
// Try to get the exact method first.
@@ -279,8 +281,20 @@ public class MethodInvoker {
if (targetObject == null && !Modifier.isStatic(preparedMethod.getModifiers())) {
throw new IllegalArgumentException("Target method must not be non-static without a target");
}
ReflectionUtils.makeAccessible(preparedMethod);
return preparedMethod.invoke(targetObject, getArguments());
try {
ReflectionUtils.makeAccessible(preparedMethod);
return preparedMethod.invoke(targetObject, getArguments());
}
catch (IllegalAccessException | InaccessibleObjectException ex) {
if (targetObject != null) {
Method fallbackMethod =
ClassUtils.getPubliclyAccessibleMethodIfPossible(preparedMethod, targetObject.getClass());
if (fallbackMethod != preparedMethod) {
return fallbackMethod.invoke(targetObject, getArguments());
}
}
throw ex;
}
}
@@ -307,12 +321,13 @@ public class MethodInvoker {
public static int getTypeDifferenceWeight(Class<?>[] paramTypes, Object[] args) {
int result = 0;
for (int i = 0; i < paramTypes.length; i++) {
if (!ClassUtils.isAssignableValue(paramTypes[i], args[i])) {
Class<?> paramType = paramTypes[i];
Object arg = args[i];
if (!ClassUtils.isAssignableValue(paramType, arg)) {
return Integer.MAX_VALUE;
}
if (args[i] != null) {
Class<?> paramType = paramTypes[i];
Class<?> superClass = args[i].getClass().getSuperclass();
if (arg != null) {
Class<?> superClass = arg.getClass().getSuperclass();
while (superClass != null) {
if (paramType.equals(superClass)) {
result = result + 2;