Include container in "java.lang.annotation.AnnotationFormatError: Duplicate annotation for class" error

scottmarlow · scottmarlow · commit 7d5a9b6e52bf · 2024-12-05T13:15:14.000-05:00
Signed-off-by: Scott Marlow &lt;smarlow@redhat.com&gt;
diff --git a/src/java.base/share/classes/sun/reflect/annotation/AnnotationParser.java b/src/java.base/share/classes/sun/reflect/annotation/AnnotationParser.java
@@ -123,7 +123,7 @@ private static Map<Class<? extends Annotation>, Annotation> parseAnnotations2(
                 if (AnnotationType.getInstance(klass).retention() == RetentionPolicy.RUNTIME &&
                     result.put(klass, a) != null) {
                         throw new AnnotationFormatError(
-                            "Duplicate annotation for class: "+klass+": " + a);
+                            "Duplicate annotation " + klass + " in " + container);
             }
         }
         }

Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,7 @@ private static Map<Class<? extends Annotation>, Annotation> parseAnnotations2(`
`123`	`123`	`if (AnnotationType.getInstance(klass).retention() == RetentionPolicy.RUNTIME &&`
`124`	`124`	`result.put(klass, a) != null) {`
`125`	`125`	`throw new AnnotationFormatError(`
`126`		`- "Duplicate annotation for class: "+klass+": " + a);`
	`126`	`+ "Duplicate annotation " + klass + " in " + container);`
`127`	`127`	`}`
`128`	`128`	`}`
`129`	`129`	`}`