From 8d4194bbf7364625a5b4f407ef48208c4ba524fd Mon Sep 17 00:00:00 2001
From: Yasser Zamani <yasserzamani@apache.org>
Date: Tue, 30 Jan 2018 12:21:33 +0330
Subject: [PATCH] allow duplicate in AnnotationUtils.findAnnotations result

See also WW-4912
---
 .../java/com/opensymphony/xwork2/util/AnnotationUtils.java    | 4 ++--
 .../com/opensymphony/xwork2/util/AnnotationUtilsTest.java     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/com/opensymphony/xwork2/util/AnnotationUtils.java b/core/src/main/java/com/opensymphony/xwork2/util/AnnotationUtils.java
index dd148550e..cbebc8003 100644
--- a/core/src/main/java/com/opensymphony/xwork2/util/AnnotationUtils.java
+++ b/core/src/main/java/com/opensymphony/xwork2/util/AnnotationUtils.java
@@ -177,12 +177,12 @@ public class AnnotationUtils {
         classes.addAll(ClassUtils.getAllInterfaces(clazz));
         for (Class<?> aClass : classes) {
             T ann = aClass.getAnnotation(annotationClass);
-            if (ann != null && !anns.contains(ann)) {
+            if (ann != null) {
                 anns.add(ann);
             }
 
             ann = aClass.getPackage().getAnnotation(annotationClass);
-            if (ann != null && !anns.contains(ann)) {
+            if (ann != null) {
                 anns.add(ann);
             }
         }
diff --git a/core/src/test/java/com/opensymphony/xwork2/util/AnnotationUtilsTest.java b/core/src/test/java/com/opensymphony/xwork2/util/AnnotationUtilsTest.java
index 12ce2936c..16fbab4fe 100644
--- a/core/src/test/java/com/opensymphony/xwork2/util/AnnotationUtilsTest.java
+++ b/core/src/test/java/com/opensymphony/xwork2/util/AnnotationUtilsTest.java
@@ -58,7 +58,7 @@ public class AnnotationUtilsTest extends TestCase {
         assertThat(annotations)
                 .isNotNull()
                 .isNotEmpty()
-                .hasSize(4);
+                .hasSize(5);
 
         Set<String> values = new HashSet<>();
         for (MyAnnotation annotation : annotations) {