Tolerate isCandidateClass call with null as annotation type

Closes gh-30842
spring-projects · Jul 9, 2023 · a102cd5 · a102cd5
1 parent d03b6aa
commit a102cd5
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/spring-core/src/main/java/org/springframework/core/annotation/AnnotationUtils.java b/spring-core/src/main/java/org/springframework/core/annotation/AnnotationUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 the original author or authors.
+ * Copyright 2002-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -149,8 +149,8 @@ public static boolean isCandidateClass(Class<?> clazz, Collection<Class<? extend
 	 * @since 5.2
 	 * @see #isCandidateClass(Class, String)
 	 */
-	public static boolean isCandidateClass(Class<?> clazz, Class<? extends Annotation> annotationType) {
-		return isCandidateClass(clazz, annotationType.getName());
+	public static boolean isCandidateClass(Class<?> clazz, @Nullable Class<? extends Annotation> annotationType) {
+		return (annotationType != null && isCandidateClass(clazz, annotationType.getName()));
 	}
 
 	/**