Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

TypeDescriptor equals implementation accepts annotations in any order (SPR-9084)

Browse Source
This commit is contained in:
Juergen Hoeller
2012-02-11 19:13:45 +01:00
parent 9470323724
commit 9e21d2f741
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
org.springframework.core/src/main/java/org/springframework/core/convert/TypeDescriptor.java
View File

@@ -547,13 +547,12 @@ public class TypeDescriptor {
if (!ObjectUtils.nullSafeEquals(getType(), other.getType())) {
return false;
}
Annotation[] ann = getAnnotations();
Annotation[] otherAnn = other.getAnnotations();
if (ann.length != otherAnn.length) {
Annotation[] annotations = getAnnotations();
if (annotations.length != other.getAnnotations().length) {
return false;
}
for (int i = 0; i < ann.length; i++) {
if (!ann[i].annotationType().equals(otherAnn[i].annotationType())) {
for (Annotation ann : annotations) {
if (other.getAnnotation(ann.annotationType()) == null) {
return false;
}
}