Browse Source

Tolerate isCandidateClass call with null as annotation type

Closes gh-30842
pull/30915/head
Juergen Hoeller 3 years ago
parent
commit
a102cd5f32
  1. 6
      spring-core/src/main/java/org/springframework/core/annotation/AnnotationUtils.java

6
spring-core/src/main/java/org/springframework/core/annotation/AnnotationUtils.java

@ -1,5 +1,5 @@ @@ -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 abstract class AnnotationUtils { @@ -149,8 +149,8 @@ public abstract class AnnotationUtils {
* @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()));
}
/**

Loading…
Cancel
Save