Changeset 19670 in josm

Timestamp:

2026-11-01T20:24:29+01:00 (less than one hour ago)

Author:

gaben

Message:

fix #24989 - crash when adding an imagery with the same HTTP header name twice

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/preferences/imagery/HeadersTable.java (modified) (3 diffs)
• test/unit/org/openstreetmap/josm/gui/preferences/imagery/HeadersTableTest.java (added)

trunk/src/org/openstreetmap/josm/gui/preferences/imagery/HeadersTable.java

@@ -5 +5 @@
 
 import java.awt.GridBagLayout;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -17 +18 @@
 
 import org.openstreetmap.josm.tools.GBC;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -112 +114 @@
     /**
      * Returns headers provided by user.
-     * @return headers provided by user
+     * Rows without a name or without a value are ignored. If several rows use the same name, the last one wins.
+     * @return headers provided by user, in table order
      */
     public Map<String, String> getHeaders() {
-        return headers.stream().distinct().collect(Collectors.toMap(x -> x[0], x -> x[1]));
+        Map<String, String> result = new LinkedHashMap<>();
+        for (String[] header : headers) {
+            if (!Utils.isStripEmpty(header[0]) && !Utils.isStripEmpty(header[1])) {
+                result.put(header[0], header[1]);
+            }
+        }
+        return result;
     }