Merge pull request #15335 from vespa-engine/jonmv/thread-safe-headers-map-in-jdisc

Use a thread safe class for holding header values

1 files changed, 7 insertions, 8 deletions

diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/HeaderFields.java b/jdisc_core/src/main/java/com/yahoo/jdisc/HeaderFields.java
index 5c35bed2cec..2f7cd59c737 100644
--- a/jdisc_core/src/main/java/com/yahoo/jdisc/HeaderFields.java
+++ b/jdisc_core/src/main/java/com/yahoo/jdisc/HeaderFields.java
@@ -3,7 +3,12 @@ package com.yahoo.jdisc;
 
 import com.google.common.collect.ImmutableList;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentSkipListMap;
 
 /**
  * This is an encapsulation of the header fields that belong to either a {@link Request} or a {@link Response}. It is
@@ -14,13 +19,7 @@ import java.util.*;
  */
 public class HeaderFields implements Map<String, List<String>> {
 
-    private final TreeMap<String, List<String>> content = new TreeMap<>(new Comparator<String>() {
-
-        @Override
-        public int compare(String lhs, String rhs) {
-            return lhs.compareToIgnoreCase(rhs);
-        }
-    });
+    private final ConcurrentSkipListMap<String, List<String>> content = new ConcurrentSkipListMap<>(String::compareToIgnoreCase);
 
     @Override
     public int size() {