Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix regression for nested AnnotationAttributes.annotationType() result

Browse Source 
See gh-22738
This commit is contained in:
Juergen Hoeller
2019-04-09 09:40:53 +02:00
parent 0a03d8e248
commit dc14ea86eb
2 changed files with 47 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-core/src/main/java/org/springframework/core/annotation/AbstractMergedAnnotation.java
View File

@@ -168,7 +168,7 @@ abstract class AbstractMergedAnnotation<A extends Annotation> implements MergedA
@Override
public AnnotationAttributes asAnnotationAttributes(Adapt... adaptations) {
return asMap(mergedAnnotation -> new AnnotationAttributes(getType()), adaptations);
return asMap(mergedAnnotation -> new AnnotationAttributes(mergedAnnotation.getType()), adaptations);
}
@Override