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

Polishing

This commit is contained in:
Juergen Hoeller 2016-03-30 10:22:30 +02:00
parent b7819e6ec8
commit 5619b005f0
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
spring-core/src/main/java/org/springframework/core/annotation/AnnotatedElementUtils.java
View File

@ -966,9 +966,8 @@ public class AnnotatedElementUtils {
}
/**
* This method is invoked by
* {@link #searchWithGetSemantics(AnnotatedElement, Class, String, Processor, Set, int)}
* to perform the actual search within the supplied list of annotations.
* This method is invoked by {@link #searchWithGetSemantics} to perform
* the actual search within the supplied list of annotations.
* <p>This method should be invoked first with locally declared annotations
* and then subsequently with inherited annotations, thereby allowing
* local annotations to take precedence over inherited annotations.
@ -996,10 +995,9 @@ public class AnnotatedElementUtils {
// Search in annotations
for (Annotation annotation : annotations) {
if (!AnnotationUtils.isInJavaLangAnnotationPackage(annotation)) {
if ((annotation.annotationType() == annotationType
|| annotation.annotationType().getName().equals(annotationName))
|| processor.alwaysProcesses()) {
if (annotation.annotationType() == annotationType ||
annotation.annotationType().getName().equals(annotationName) ||
processor.alwaysProcesses()) {
T result = processor.process(element, annotation, metaDepth);
if (result != null) {
if (processor.aggregates() && metaDepth == 0) {