root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Polishing

This commit is contained in:
Juergen Hoeller 2014-01-30 12:26:41 +01:00
parent c1eac209c3
commit a537eb3a6a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
spring-core/src/main/java/org/springframework/core/convert/TypeDescriptor.java
View File

@ -461,17 +461,17 @@ public class TypeDescriptor implements Serializable {
if (getAnnotations().length != other.getAnnotations().length) { if (getAnnotations().length != other.getAnnotations().length) {
return false; return false;
} }
for (Annotation ann : this.getAnnotations()) { for (Annotation ann : getAnnotations()) {
if (other.getAnnotation(ann.annotationType()) == null) { if (other.getAnnotation(ann.annotationType()) == null) {
return false; return false;
} }
} }
if (isCollection() || isArray()) { if (isCollection() || isArray()) {
return ObjectUtils.nullSafeEquals(this.getElementTypeDescriptor(), other.getElementTypeDescriptor()); return ObjectUtils.nullSafeEquals(getElementTypeDescriptor(), other.getElementTypeDescriptor());
} }
else if (isMap()) { else if (isMap()) {
return ObjectUtils.nullSafeEquals(this.getMapKeyTypeDescriptor(), other.getMapKeyTypeDescriptor()) && return ObjectUtils.nullSafeEquals(getMapKeyTypeDescriptor(), other.getMapKeyTypeDescriptor()) &&
ObjectUtils.nullSafeEquals(this.getMapValueTypeDescriptor(), other.getMapValueTypeDescriptor()); ObjectUtils.nullSafeEquals(getMapValueTypeDescriptor(), other.getMapValueTypeDescriptor());
} }
else { else {
return true; return true;