Skip to content

Commit c6b1f38

Browse files
committed
Support @scheduled as a merged composable annotation
Issue: SPR-13973
1 parent b6d9fd3 commit c6b1f38

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
import org.springframework.context.event.ContextRefreshedEvent;
4444
import org.springframework.core.MethodIntrospector;
4545
import org.springframework.core.Ordered;
46-
import org.springframework.core.annotation.AnnotationUtils;
46+
import org.springframework.core.annotation.AnnotatedElementUtils;
4747
import org.springframework.scheduling.TaskScheduler;
4848
import org.springframework.scheduling.Trigger;
4949
import org.springframework.scheduling.config.CronTask;
@@ -258,7 +258,7 @@ public Object postProcessAfterInitialization(final Object bean, String beanName)
258258
@Override
259259
public Set<Scheduled> inspect(Method method) {
260260
Set<Scheduled> scheduledMethods =
261-
AnnotationUtils.getRepeatableAnnotations(method, Scheduled.class, Schedules.class);
261+
AnnotatedElementUtils.getMergedRepeatableAnnotations(method, Scheduled.class, Schedules.class);
262262
return (!scheduledMethods.isEmpty() ? scheduledMethods : null);
263263
}
264264
});

0 commit comments

Comments
 (0)