From 99e5964aa3f7d296a06c42ed3b78a6a5f0751516 Mon Sep 17 00:00:00 2001 From: Swapnil kachare Date: Sat, 21 Nov 2026 17:58:22 +0530 Subject: [PATCH 1/3] Fix LinkedCaseInsensitiveMap.KeySet.remove() for null values Signed-off-by: Swapnil kachare --- .../springframework/util/LinkedCaseInsensitiveMap.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) 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 e54e4b4864c..d2ea4c39775 100644 --- a/spring-core/src/main/java/org/springframework/util/LinkedCaseInsensitiveMap.java +++ b/spring-core/src/main/java/org/springframework/util/LinkedCaseInsensitiveMap.java @@ -365,11 +365,17 @@ public Iterator iterator() { return new KeySetIterator(); } + @Override public boolean remove(Object o) { - return LinkedCaseInsensitiveMap.this.remove(o) != null; + if (containsKey(o)) { + LinkedCaseInsensitiveMap.this.remove(o); + return true; + } + return false; } + @Override public void clear() { LinkedCaseInsensitiveMap.this.clear(); From 9058a90b9e35fd605d7265b4a0483d9031fe967b Mon Sep 17 00:00:00 2001 From: Sam Brannen <104798+sbrannen@users.noreply.github.com> Date: Sat, 21 Nov 2026 15:23:25 +0100 Subject: [PATCH 2/3] Update spring-core/src/main/java/org/springframework/util/LinkedCaseInsensitiveMap.java Signed-off-by: Sam Brannen <104798+sbrannen@users.noreply.github.com> --- .../java/org/springframework/util/LinkedCaseInsensitiveMap.java | 1 - 1 file changed, 1 deletion(-) 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 d2ea4c39775..2b23211358e 100644 --- a/spring-core/src/main/java/org/springframework/util/LinkedCaseInsensitiveMap.java +++ b/spring-core/src/main/java/org/springframework/util/LinkedCaseInsensitiveMap.java @@ -365,7 +365,6 @@ public Iterator iterator() { return new KeySetIterator(); } - @Override public boolean remove(Object o) { if (containsKey(o)) { From 6d5f36e45ee3052969f46a5cc344507672006d83 Mon Sep 17 00:00:00 2001 From: Sam Brannen <104798+sbrannen@users.noreply.github.com> Date: Sat, 21 Nov 2026 15:23:32 +0100 Subject: [PATCH 3/3] Update spring-core/src/main/java/org/springframework/util/LinkedCaseInsensitiveMap.java Signed-off-by: Sam Brannen <104798+sbrannen@users.noreply.github.com> --- .../java/org/springframework/util/LinkedCaseInsensitiveMap.java | 1 - 1 file changed, 1 deletion(-) 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 2b23211358e..b2838658324 100644 --- a/spring-core/src/main/java/org/springframework/util/LinkedCaseInsensitiveMap.java +++ b/spring-core/src/main/java/org/springframework/util/LinkedCaseInsensitiveMap.java @@ -374,7 +374,6 @@ public boolean remove(Object o) { return false; } - @Override public void clear() { LinkedCaseInsensitiveMap.this.clear();