Differentiate between TypeDescriptors with same annotations but different attributes

Issue: SPR-13714
2015-12-18 22:10:50 +01:00
parent 06056e6aa6
commit 387c8a8181
3 changed files with 399 additions and 298 deletions
--- a/spring-core/src/main/java/org/springframework/core/convert/TypeDescriptor.java
+++ b/spring-core/src/main/java/org/springframework/core/convert/TypeDescriptor.java
@@ -468,7 +468,7 @@ public class TypeDescriptor implements Serializable {
 			return false;
 		}
 		for (Annotation ann : getAnnotations()) {
-			if (!other.hasAnnotation(ann.annotationType())) {
+			if (!ann.equals(other.getAnnotation(ann.annotationType()))) {
 				return false;
 			}
 		}