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

TypeDescriptor efficiently matches equal annotations as well

Browse Source 
Issue: SPR-15060
This commit is contained in:
Juergen Hoeller
2016-12-28 22:51:29 +01:00
parent 963ea062e4
commit e38c020535
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -479,7 +479,7 @@ public class TypeDescriptor implements Serializable {
} }
if (anns.length > 0) { if (anns.length > 0) {
for (int i = 0; i < anns.length; i++) { for (int i = 0; i < anns.length; i++) {
if (anns[i] != otherAnns[i]) { if (!annotationEquals(anns[i], otherAnns[i])) {
return false; return false;
} }
} }
@@ -487,6 +487,11 @@ public class TypeDescriptor implements Serializable {
return true; return true;
} }
private boolean annotationEquals(Annotation ann, Annotation otherAnn) {
// Annotation.equals is reflective and pretty slow, so let's check identity and proxy type first.
return (ann == otherAnn || (ann.getClass() == otherAnn.getClass() && ann.equals(otherAnn)));
}
@Override @Override
public int hashCode() { public int hashCode() {
return getType().hashCode(); return getType().hashCode();