Use synchronizedList which accepts null values

vespa-engine · Nov 13, 2020 · 897a048 · 897a048
1 parent b4ae98c
commit 897a048
Showing 1 changed file with 3 additions and 2 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
@@ -5,6 +5,7 @@
 
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -140,14 +141,14 @@ public void addAll(Map<? extends String, ? extends List<String>> values) {
      *         <code>key</code>.
      */
     public List<String> put(String key, String value) {
-        ArrayList<String> list = new ArrayList<String>(1);
+        List<String> list = Collections.synchronizedList(new ArrayList<>(1));
         list.add(value);
         return content.put(key, list);
     }
 
     @Override
     public List<String> put(String key, List<String> value) {
-        return content.put(key, new ArrayList<>(value));
+        return content.put(key, Collections.synchronizedList(new ArrayList<>(value)));
     }
 
     @Override