admin/spring-projects-spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework synced 2026-06-08 17:33:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '7.0.x'

Browse Source
This commit is contained in:
Sébastien Deleuze
2026-04-07 15:11:54 +02:00
parent 3806315e31 f5a8c321c0
commit 2a1678f246
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-core/src/main/java/org/springframework/core/annotation/AnnotatedElementUtils.java
+1 -1
View File
@@ -823,7 +823,7 @@ public abstract class AnnotatedElementUtils {
return MergedAnnotations.from(element, SearchStrategy.TYPE_HIERARCHY, repeatableContainers);
}
private static @Nullable MultiValueMap<String, Object> nullIfEmpty(MultiValueMap<String, Object> map) {
private static @Nullable MultiValueMap<String, @Nullable Object> nullIfEmpty(MultiValueMap<String, @Nullable Object> map) {
return (map.isEmpty() ? null : map);
}