From f493a880d9ea3991fd557f9a944989c09f69025a Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Mon, 10 Feb 2025 09:37:47 +0100 Subject: [PATCH] Fix improper null/emptiness check. See #3170 --- src/main/java/org/springframework/data/util/NullableUtils.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/springframework/data/util/NullableUtils.java b/src/main/java/org/springframework/data/util/NullableUtils.java index 5ff82a663e..2da0761969 100644 --- a/src/main/java/org/springframework/data/util/NullableUtils.java +++ b/src/main/java/org/springframework/data/util/NullableUtils.java @@ -37,6 +37,7 @@ import org.springframework.core.annotation.MergedAnnotations; import org.springframework.lang.NonNullApi; import org.springframework.util.ClassUtils; +import org.springframework.util.CollectionUtils; import org.springframework.util.MultiValueMap; /** @@ -234,7 +235,7 @@ private static boolean test(Annotation annotation, String metaAnnotationName MultiValueMap attributes = AnnotatedElementUtils .getAllAnnotationAttributes(annotation.annotationType(), metaAnnotationName); - if (attributes.isEmpty()) { + if (CollectionUtils.isEmpty(attributes)) { return false; }