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

ScheduledAnnotationBeanPostProcessor uses target class as cache key in case of proxy 

Issue: SPR-12709
This commit is contained in:
Juergen Hoeller 2015-02-18 16:16:05 +01:00
parent 8159aa99a1
commit 1273c90a64
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
spring-context/src/main/java/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessor.java
View File

@ -64,12 +64,12 @@ import org.springframework.util.StringValueResolver;
* to the "fixedRate", "fixedDelay", or "cron" expression provided via the annotation. * to the "fixedRate", "fixedDelay", or "cron" expression provided via the annotation.
* *
* <p>This post-processor is automatically registered by Spring's * <p>This post-processor is automatically registered by Spring's
* {@code <task:annotation-driven>} XML element, and also by the @{@link EnableScheduling} * {@code <task:annotation-driven>} XML element, and also by the
* annotation. * @{@link EnableScheduling} annotation.
* *
* <p>Auto-detects any {@link SchedulingConfigurer} instances in the container, * <p>Autodetects any {@link SchedulingConfigurer} instances in the container,
* allowing for customization of the scheduler to be used or for fine-grained control * allowing for customization of the scheduler to be used or for fine-grained
* over task registration (e.g. registration of {@link Trigger} tasks. * control over task registration (e.g. registration of {@link Trigger} tasks.
* See the @{@link EnableScheduling} javadocs for complete usage details. * See the @{@link EnableScheduling} javadocs for complete usage details.
* *
* @author Mark Fisher * @author Mark Fisher
@ -216,9 +216,9 @@ public class ScheduledAnnotationBeanPostProcessor implements BeanPostProcessor,
@Override @Override
public Object postProcessAfterInitialization(final Object bean, String beanName) { public Object postProcessAfterInitialization(final Object bean, String beanName) {
if (!this.nonAnnotatedClasses.contains(bean.getClass())) {
final Set<Method> annotatedMethods = new LinkedHashSet<Method>(1);
Class<?> targetClass = AopUtils.getTargetClass(bean); Class<?> targetClass = AopUtils.getTargetClass(bean);
if (!this.nonAnnotatedClasses.contains(targetClass)) {
final Set<Method> annotatedMethods = new LinkedHashSet<Method>(1);
ReflectionUtils.doWithMethods(targetClass, new MethodCallback() { ReflectionUtils.doWithMethods(targetClass, new MethodCallback() {
@Override @Override
public void doWith(Method method) throws IllegalArgumentException, IllegalAccessException { public void doWith(Method method) throws IllegalArgumentException, IllegalAccessException {
@ -230,7 +230,7 @@ public class ScheduledAnnotationBeanPostProcessor implements BeanPostProcessor,
} }
}); });
if (annotatedMethods.isEmpty()) { if (annotatedMethods.isEmpty()) {
this.nonAnnotatedClasses.add(bean.getClass()); this.nonAnnotatedClasses.add(targetClass);
if (logger.isDebugEnabled()) { if (logger.isDebugEnabled()) {
logger.debug("No @Scheduled annotations found on bean class: " + bean.getClass()); logger.debug("No @Scheduled annotations found on bean class: " + bean.getClass());
} }