root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Merge branch '6.2.x'

This commit is contained in:
Sam Brannen 2025-04-22 11:55:39 +02:00
parent e7402bc365 8c376e9cc5
commit fc516cb39e
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spring-core/src/main/java/org/springframework/core/annotation/AnnotationsScanner.java
View File

@ -356,16 +356,12 @@ abstract class AnnotationsScanner {
} }
private static boolean hasSameParameterTypes(Method rootMethod, Method candidateMethod) { private static boolean hasSameParameterTypes(Method rootMethod, Method candidateMethod) {
if (candidateMethod.getParameterCount() != rootMethod.getParameterCount()) {
return false;
}
Class<?>[] rootParameterTypes = rootMethod.getParameterTypes(); Class<?>[] rootParameterTypes = rootMethod.getParameterTypes();
Class<?>[] candidateParameterTypes = candidateMethod.getParameterTypes(); Class<?>[] candidateParameterTypes = candidateMethod.getParameterTypes();
if (Arrays.equals(candidateParameterTypes, rootParameterTypes)) { if (Arrays.equals(candidateParameterTypes, rootParameterTypes)) {
return true; return true;
} }
return hasSameGenericTypeParameters(rootMethod, candidateMethod, return hasSameGenericTypeParameters(rootMethod, candidateMethod, rootParameterTypes);
rootParameterTypes);
} }
private static boolean hasSameGenericTypeParameters( private static boolean hasSameGenericTypeParameters(