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

After-returning advice strictly follows AspectJ's rules for return value matching 

Issue: SPR-10834
This commit is contained in:
Juergen Hoeller 2013-09-25 14:47:01 +02:00 committed by unknown
parent 77fa8698b3
commit d3f063d0f9
1 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAfterReturningAdvice.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2012 the original author or authors. * Copyright 2002-2013 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -71,12 +71,34 @@ public class AspectJAfterReturningAdvice extends AbstractAspectJAdvice implement
* @return whether to invoke the advice method for the given return value * @return whether to invoke the advice method for the given return value
*/ */
private boolean shouldInvokeOnReturnValueOf(Method method, Object returnValue) { private boolean shouldInvokeOnReturnValueOf(Method method, Object returnValue) {
Class type = getDiscoveredReturningType(); Class<?> type = getDiscoveredReturningType();
Type genericType = getDiscoveredReturningGenericType(); Type genericType = getDiscoveredReturningGenericType();
// If we aren't dealing with a raw type, check if generic parameters are assignable. // If we aren't dealing with a raw type, check if generic parameters are assignable.
return (ClassUtils.isAssignableValue(type, returnValue) && return (matchesReturnValue(type, method, returnValue) &&
(genericType == null || genericType == type || (genericType == null || genericType == type ||
TypeUtils.isAssignable(genericType, method.getGenericReturnType()))); TypeUtils.isAssignable(genericType, method.getGenericReturnType())));
} }
/**
* Following AspectJ semantics, if a return value is null (or return type is void),
* then the return type of target method should be used to determine whether advice
* is invoked or not. Also, even if the return type is void, if the type of argument
* declared in the advice method is Object, then the advice must still get invoked.
* @param type the type of argument declared in advice method
* @param method the advice method
* @param returnValue the return value of the target method
* @return whether to invoke the advice method for the given return value and type
*/
private boolean matchesReturnValue(Class<?> type, Method method, Object returnValue) {
if (returnValue != null) {
return ClassUtils.isAssignableValue(type, returnValue);
}
else if (type.equals(Object.class) && method.getReturnType().equals(void.class)) {
return true;
}
else{
return ClassUtils.isAssignable(type, method.getReturnType());
}
}
} }