This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new 4eff5e0 Java 7 compatibility
4eff5e0 is described below
commit 4eff5e04156a7f4f25c6615835689d616df9cda3
Author: remm <[email protected]>
AuthorDate: Wed May 5 16:45:34 2021 +0200
Java 7 compatibility
---
java/org/apache/tomcat/util/bcel/classfile/JavaClass.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java
b/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java
index 819175a..431df3a 100644
--- a/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java
+++ b/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java
@@ -95,7 +95,9 @@ public class JavaClass {
if (runtimeVisibleFieldOrMethodAnnotations != null) {
for (Annotations annotations :
runtimeVisibleFieldOrMethodAnnotations.toArray(new Annotations[0])) {
for (AnnotationEntry annotationEntry :
annotations.getAnnotationEntries()) {
-
annotationEntries.putIfAbsent(annotationEntry.getAnnotationType(),
annotationEntry);
+ if
(!annotationEntries.containsKey(annotationEntry.getAnnotationType())) {
+
annotationEntries.put(annotationEntry.getAnnotationType(), annotationEntry);
+ }
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
