Spring/spring-retry
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Restore missing method call from merge in #124

Browse Source
This commit is contained in:
Dave Syer
2020-04-07 06:25:45 +01:00
parent f54db742f5
commit 4fe92bb20f
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/org/springframework/retry/annotation/RecoverAnnotationRecoveryHandler.java
View File

@@ -159,7 +159,7 @@ public class RecoverAnnotationRecoveryHandler<T> implements MethodInvocationReco
return false;
}
private void init(Object target, Method method) {
private void init(final Object target, Method method) {
final Map<Class<? extends Throwable>, Method> types = new HashMap<Class<? extends Throwable>, Method>();
final Method failingMethod = method;
Retryable retryable = method.getAnnotation(Retryable.class);
@@ -170,6 +170,9 @@ public class RecoverAnnotationRecoveryHandler<T> implements MethodInvocationReco
@Override
public void doWith(Method method) throws IllegalArgumentException, IllegalAccessException {
Recover recover = AnnotationUtils.findAnnotation(method, Recover.class);
if (recover == null) {
recover = findAnnotationOnTarget(target, method);
}
if (recover != null && method.getReturnType().isAssignableFrom(failingMethod.getReturnType())) {
Class<?>[] parameterTypes = method.getParameterTypes();
if (parameterTypes.length > 0 && Throwable.class.isAssignableFrom(parameterTypes[0])) {