diff options
Diffstat (limited to 'spring-aspects/src/main/java/org/springframework/scheduling/aspectj/AnnotationAsyncExecutionAspect.aj')
| -rw-r--r-- | spring-aspects/src/main/java/org/springframework/scheduling/aspectj/AnnotationAsyncExecutionAspect.aj | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/spring-aspects/src/main/java/org/springframework/scheduling/aspectj/AnnotationAsyncExecutionAspect.aj b/spring-aspects/src/main/java/org/springframework/scheduling/aspectj/AnnotationAsyncExecutionAspect.aj index e1a1fd97..2b22ec90 100644 --- a/spring-aspects/src/main/java/org/springframework/scheduling/aspectj/AnnotationAsyncExecutionAspect.aj +++ b/spring-aspects/src/main/java/org/springframework/scheduling/aspectj/AnnotationAsyncExecutionAspect.aj @@ -19,7 +19,7 @@ package org.springframework.scheduling.aspectj; import java.lang.reflect.Method; import java.util.concurrent.Future; -import org.springframework.core.annotation.AnnotationUtils; +import org.springframework.core.annotation.AnnotatedElementUtils; import org.springframework.scheduling.annotation.Async; /** @@ -68,9 +68,9 @@ public aspect AnnotationAsyncExecutionAspect extends AbstractAsyncExecutionAspec protected String getExecutorQualifier(Method method) { // Maintainer's note: changes made here should also be made in // AnnotationAsyncExecutionInterceptor#getExecutorQualifier - Async async = AnnotationUtils.findAnnotation(method, Async.class); + Async async = AnnotatedElementUtils.findMergedAnnotation(method, Async.class); if (async == null) { - async = AnnotationUtils.findAnnotation(method.getDeclaringClass(), Async.class); + async = AnnotatedElementUtils.findMergedAnnotation(method.getDeclaringClass(), Async.class); } return (async != null ? async.value() : null); } |