Issue #12429 - optimize implementation of HttpFields.asMap

Signed-off-by: Lachlan Roberts <[email protected]>
jetty · Oct 30, 2024 · 0487815 · 0487815
1 parent 8ff6828
commit 0487815
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/HttpFields.java b/jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/HttpFields.java
@@ -931,7 +931,14 @@ default int size()
     static Map<String, List<String>> asMap(HttpFields fields)
     {
         Map<String, List<String>> headers = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
-        fields.getFieldNamesCollection().forEach(name -> headers.putIfAbsent(name, fields.getValuesList(name)));
+        for (HttpField f : fields)
+        {
+            if (!headers.containsKey(f.getName()))
+            {
+                HttpHeader header = f.getHeader();
+                headers.put(f.getName(), header == null ? fields.getValuesList(f.getName()) : fields.getValuesList(header));
+            }
+        }
         return headers;
     }