Merge branch '6.1.x'

Author: sbrannen

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

@@ -764,7 +764,7 @@ private static AnnotatedElementAdapter from(@Nullable Annotation[] annotations)
 
 		@Override
 		public boolean isAnnotationPresent(Class<? extends Annotation> annotationClass) {
-			for (Annotation annotation : getAnnotations()) {
+			for (Annotation annotation : this.annotations) {
 				if (annotation.annotationType() == annotationClass) {
 					return true;
 				}
@@ -776,7 +776,7 @@ public boolean isAnnotationPresent(Class<? extends Annotation> annotationClass)
 		@Nullable
 		@SuppressWarnings("unchecked")
 		public <T extends Annotation> T getAnnotation(Class<T> annotationClass) {
-			for (Annotation annotation : getAnnotations()) {
+			for (Annotation annotation : this.annotations) {
 				if (annotation.annotationType() == annotationClass) {
 					return (T) annotation;
 				}