diff --git a/spring-core/src/main/java/org/springframework/util/LinkedCaseInsensitiveMap.java b/spring-core/src/main/java/org/springframework/util/LinkedCaseInsensitiveMap.java index 3a1f9f102946..60d82f270809 100644 --- a/spring-core/src/main/java/org/springframework/util/LinkedCaseInsensitiveMap.java +++ b/spring-core/src/main/java/org/springframework/util/LinkedCaseInsensitiveMap.java @@ -181,7 +181,9 @@ public V getOrDefault(Object key, V defaultValue) { if (key instanceof String string) { String caseInsensitiveKey = this.caseInsensitiveKeys.get(convertKey(string)); if (caseInsensitiveKey != null) { - return this.targetMap.get(caseInsensitiveKey); + V v = this.targetMap.get(caseInsensitiveKey); + if (v != null) + return v; } } return defaultValue;