Changeset 15014 in josm for trunk/src

Timestamp:

2019-04-22T15:12:54+02:00 (6 years ago)

Author:

Don-vip

Message:

see #17635 - make sure primitives can't be created with invalid tags using setKeys method

File:

• trunk/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java

@@ -15 +15 @@
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Objects;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
@@ -498 +499 @@
         int index = 0;
         for (Entry<String, String> entry:keys.entrySet()) {
-            newKeys[index++] = entry.getKey();
-            newKeys[index++] = entry.getValue();
+            newKeys[index++] = Objects.requireNonNull(entry.getKey());
+            newKeys[index++] = Objects.requireNonNull(entry.getValue());
         }
         this.keys = newKeys;