Strict nullability for field assignment

spring-projects · Nov 9, 2020 · bd2640a · bd2640a
1 parent 6825287
commit bd2640a
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/spring-test/src/main/java/org/springframework/test/context/TestContextAnnotationUtils.java b/spring-test/src/main/java/org/springframework/test/context/TestContextAnnotationUtils.java
@@ -492,10 +492,11 @@ public static class AnnotationDescriptor<T extends Annotation> {
 			Assert.notNull(annotation, "Annotation must not be null");
 			this.rootDeclaringClass = rootDeclaringClass;
 			this.declaringClass = declaringClass;
-			this.annotation = (T) AnnotatedElementUtils.findMergedAnnotation(
+			T mergedAnnotation = (T) AnnotatedElementUtils.findMergedAnnotation(
 					rootDeclaringClass, annotation.annotationType());
-			Assert.state(this.annotation != null,
+			Assert.state(mergedAnnotation != null,
 					() -> "Failed to find merged annotation for " + annotation);
+			this.annotation = mergedAnnotation;
 		}
 
 		public Class<?> getRootDeclaringClass() {