From f657952cee063f9b0879c8e0650f9aa03652946f Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Sat, 4 Jun 2016 00:15:52 +0200 Subject: [PATCH] EventListenerMethodProcessor defensively handles unresolvable method signatures Issue: SPR-14330 --- .../event/EventListenerMethodProcessor.java | 26 +++++++++++++------ 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/spring-context/src/main/java/org/springframework/context/event/EventListenerMethodProcessor.java b/spring-context/src/main/java/org/springframework/context/event/EventListenerMethodProcessor.java index 9fea9f47edc..7a95f172e3d 100644 --- a/spring-context/src/main/java/org/springframework/context/event/EventListenerMethodProcessor.java +++ b/spring-context/src/main/java/org/springframework/context/event/EventListenerMethodProcessor.java @@ -42,6 +42,7 @@ import org.springframework.core.MethodIntrospector; import org.springframework.core.annotation.AnnotatedElementUtils; import org.springframework.core.annotation.AnnotationAwareOrderComparator; import org.springframework.util.Assert; +import org.springframework.util.CollectionUtils; /** * Register {@link EventListener} annotated method as individual {@link ApplicationListener} @@ -125,14 +126,23 @@ public class EventListenerMethodProcessor implements SmartInitializingSingleton, protected void processBean(final List factories, final String beanName, final Class targetType) { if (!this.nonAnnotatedClasses.contains(targetType)) { - Map annotatedMethods = MethodIntrospector.selectMethods(targetType, - new MethodIntrospector.MetadataLookup() { - @Override - public EventListener inspect(Method method) { - return AnnotatedElementUtils.findMergedAnnotation(method, EventListener.class); - } - }); - if (annotatedMethods.isEmpty()) { + Map annotatedMethods = null; + try { + annotatedMethods = MethodIntrospector.selectMethods(targetType, + new MethodIntrospector.MetadataLookup() { + @Override + public EventListener inspect(Method method) { + return AnnotatedElementUtils.findMergedAnnotation(method, EventListener.class); + } + }); + } + catch (Throwable ex) { + // An unresolvable type in a method signature, probably from a lazy bean - let's ignore it. + if (logger.isDebugEnabled()) { + logger.debug("Could not resolve methods for bean with name '" + beanName + "'", ex); + } + } + if (CollectionUtils.isEmpty(annotatedMethods)) { this.nonAnnotatedClasses.add(targetType); if (logger.isTraceEnabled()) { logger.trace("No @EventListener annotations found on bean class: " + targetType);