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

AspectJExpressionPointcut leniently ignores non-composable interfaces 

Issue: SPR-17003
This commit is contained in:
Juergen Hoeller 2018-07-22 22:28:48 +02:00
parent f58854f4b9
commit bccff73e2b
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJExpressionPointcut.java
View File

@ -433,9 +433,15 @@ public class AspectJExpressionPointcut extends AbstractExpressionPointcut
// Note: AspectJ is only going to take Method.getDeclaringClass() into account. // Note: AspectJ is only going to take Method.getDeclaringClass() into account.
Set<Class<?>> ifcs = ClassUtils.getAllInterfacesForClassAsSet(targetClass); Set<Class<?>> ifcs = ClassUtils.getAllInterfacesForClassAsSet(targetClass);
if (ifcs.size() > 1) { if (ifcs.size() > 1) {
Class<?> compositeInterface = ClassUtils.createCompositeInterface( try {
ClassUtils.toClassArray(ifcs), targetClass.getClassLoader()); Class<?> compositeInterface = ClassUtils.createCompositeInterface(
targetMethod = ClassUtils.getMostSpecificMethod(targetMethod, compositeInterface); ClassUtils.toClassArray(ifcs), targetClass.getClassLoader());
targetMethod = ClassUtils.getMostSpecificMethod(targetMethod, compositeInterface);
}
catch (IllegalArgumentException ex) {
// Implemented interfaces probably expose conflicting method signatures...
// Proceed with original target method.
}
} }
} }
return getShadowMatch(targetMethod, method); return getShadowMatch(targetMethod, method);

2
spring-core/src/main/java/org/springframework/util/ClassUtils.java
View File

@ -771,6 +771,8 @@ public abstract class ClassUtils {
* @param interfaces the interfaces to merge * @param interfaces the interfaces to merge
* @param classLoader the ClassLoader to create the composite Class in * @param classLoader the ClassLoader to create the composite Class in
* @return the merged interface as Class * @return the merged interface as Class
* @throws IllegalArgumentException if the specified interfaces expose
* conflicting method signatures (or a similar constraint is violated)
* @see java.lang.reflect.Proxy#getProxyClass * @see java.lang.reflect.Proxy#getProxyClass
*/ */
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")