Merge branch '6.0.x'

Closes gh-13001
2023-04-11 17:09:21 -06:00
parent 5db3e54647 4813ec1e09
commit b3c83440bd
2 changed files with 28 additions and 1 deletions
--- a/web/src/main/java/org/springframework/security/web/FilterInvocation.java
+++ b/web/src/main/java/org/springframework/security/web/FilterInvocation.java
@@ -26,6 +26,7 @@ import java.lang.reflect.Proxy;
 import java.util.Collections;
 import java.util.Enumeration;
 import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.Map;

 import jakarta.servlet.FilterChain;
@@ -257,7 +258,11 @@ public class FilterInvocation {

 		@Override
 		public Enumeration<String> getHeaders(String name) {
-			return Collections.enumeration(this.headers.get(name));
+			List<String> headerList = this.headers.get(name);
+			if (headerList == null) {
+				return Collections.emptyEnumeration();
+			}
+			return Collections.enumeration(headerList);
 		}

 		@Override