From a102cd5f327108d25e0665f601222add85daf47b Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Sun, 9 Jul 2023 16:52:54 +0200 Subject: [PATCH] Tolerate isCandidateClass call with null as annotation type Closes gh-30842 --- .../springframework/core/annotation/AnnotationUtils.java | 6 +++--- 1 file changed, 3 insertions(+), 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 index 99f6e4f4dd14..a904f39d91fb 100644 --- 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 clazz, Class annotationType) { - return isCandidateClass(clazz, annotationType.getName()); + public static boolean isCandidateClass(Class clazz, @Nullable Class annotationType) { + return (annotationType != null && isCandidateClass(clazz, annotationType.getName())); } /**