spring/spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework.git synced 2026-10-03 05:19:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch '7.0.x'

Browse Source
This commit is contained in:
Sam Brannen
2026-04-03 15:39:58 +02:00
parent 4709f68446 d10460d775
commit f2d4d59f5a
5 changed files with 202 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-context/src/main/java/org/springframework/context/annotation/AnnotationBeanNameGenerator.java
+1 -11
View File
@@ -139,17 +139,7 @@ public class AnnotationBeanNameGenerator implements BeanNameGenerator {
Set<AnnotationAttributes> visited = new HashSet<>();
for (MergedAnnotation<Annotation> mergedAnnotation : mergedAnnotations) {
AnnotationAttributes attributes = null;
try {
attributes = mergedAnnotation.asAnnotationAttributes(ADAPTATIONS);
}
catch (Throwable ex) {
// Ignore exception and current MergedAnnotation, assuming that values of the
// MergedAnnotation could not be adapted to a Map/AnnotationAttributes due to
// missing types referenced via annotation attributes.
continue;
}
AnnotationAttributes attributes = mergedAnnotation.asAnnotationAttributes(ADAPTATIONS);
if (visited.add(attributes)) {
String annotationType = mergedAnnotation.getType().getName();
Set<String> metaAnnotationTypes = this.metaAnnotationTypesCache.computeIfAbsent(annotationType,