Changeset 19124 in josm for trunk

Timestamp:

2024-06-22T16:12:54+02:00 (3 months ago)

Author:

GerdP

Message:

fix #23748: NPE: Reverse way direction: Automatic tag correction
(furter already expected regrression from r19101)

• don't use Map.ofEntries() when map may contain null keys or values

I try to write a unit test for this as well

File:

• trunk/src/org/openstreetmap/josm/tools/Utils.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/tools/Utils.java

@@ -666 +666 @@
             return Collections.singletonMap(entry.getKey(), entry.getValue());
         }
-        // Map.copyOf would also work, but if the original map is immutable, it just returns the original map.
-        return Map.ofEntries(map.entrySet().toArray(new Map.Entry[0]));
+        // see #23748 don't use Map.ofEntries as it doesn't allow null keys or values
+        return Collections.unmodifiableMap(map);
     }