Browse Source

AnnotationUtils.getAnnotation non-null check for synthesizeAnnotation

Issue: SPR-16708
pull/1787/head
Juergen Hoeller 8 years ago
parent
commit
da80502ea6
  1. 3
      spring-core/src/main/java/org/springframework/core/annotation/AnnotationUtils.java

3
spring-core/src/main/java/org/springframework/core/annotation/AnnotationUtils.java

@ -166,7 +166,8 @@ public abstract class AnnotationUtils { @@ -166,7 +166,8 @@ public abstract class AnnotationUtils {
}
Class<? extends Annotation> annotatedElement = annotation.annotationType();
try {
return synthesizeAnnotation(annotatedElement.getAnnotation(annotationType), annotatedElement);
A metaAnn = annotatedElement.getAnnotation(annotationType);
return (metaAnn != null ? synthesizeAnnotation(metaAnn, annotatedElement) : null);
}
catch (Throwable ex) {
handleIntrospectionFailure(annotatedElement, ex);

Loading…
Cancel
Save