From 89802cfc11bc7b94387bf75f376dc08218e3946c Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <jhoeller@pivotal.io>
Date: Wed, 23 Nov 2016 12:25:01 +0100
Subject: [PATCH] TypeDescriptor avoids merged annotations for equality
 comparisons

Issue: SPR-14926
Issue: SPR-14929
---
 .../org/springframework/core/convert/TypeDescriptor.java   | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/spring-core/src/main/java/org/springframework/core/convert/TypeDescriptor.java b/spring-core/src/main/java/org/springframework/core/convert/TypeDescriptor.java
index f582295c03..d7b9c1a245 100644
--- a/spring-core/src/main/java/org/springframework/core/convert/TypeDescriptor.java
+++ b/spring-core/src/main/java/org/springframework/core/convert/TypeDescriptor.java
@@ -441,14 +441,9 @@ public class TypeDescriptor implements Serializable {
 		if (!ObjectUtils.nullSafeEquals(getType(), other.getType())) {
 			return false;
 		}
-		if (getAnnotations().length != other.getAnnotations().length) {
+		if (!Arrays.equals(getAnnotations(), other.getAnnotations())) {
 			return false;
 		}
-		for (Annotation ann : getAnnotations()) {
-			if (!ann.equals(other.getAnnotation(ann.annotationType()))) {
-				return false;
-			}
-		}
 		if (isCollection() || isArray()) {
 			return ObjectUtils.nullSafeEquals(getElementTypeDescriptor(), other.getElementTypeDescriptor());
 		}