Changeset 19133 in josm for trunk/src/org/openstreetmap

Timestamp:

2024-07-09T15:50:36+02:00 (7 months ago)

Author:

taylor.smock

Message:

See #23727, #23748: Re-enable Map.ofEntries for Utils#toUnmodifiableMap

This restores the behavior that was present prior to r19101 without reflection.

In r19100 and earlier, the NPE was caught and rethrown as a reflection exception.
At this point, we then returned a Collections.unmodifiableMap object.

File:

• trunk/src/org/openstreetmap/josm/tools/Utils.java (modified) (2 diffs)

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

@@ -658 +658 @@
      *     How to Prevent Your Java Collections From Wasting Memory</a>
      */
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings({"unchecked", "squid:S1696"})
     public static <K, V> Map<K, V> toUnmodifiableMap(Map<K, V> map) {
         if (isEmpty(map)) {
@@ -666 +666 @@
             return Collections.singletonMap(entry.getKey(), entry.getValue());
         }
-        // see #23748 don't use Map.ofEntries as it doesn't allow null keys or values
+        // see #23748: If the map contains `null`, then Map.ofEntries will throw an NPE.
+        // We also cannot check the map for `null`, since that may _also_ throw an NPE.
+        try {
+            return Map.ofEntries(map.entrySet().toArray(new Map.Entry[0]));
+        } catch (NullPointerException e) {
+            Logging.trace(e);
+        }
         return Collections.unmodifiableMap(map);
     }