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

Timestamp:

2016-01-27T22:12:51+01:00 (9 years ago)

Author:

Don-vip

Message:

see #12355 - fix NPE (regression from r9649)

File:

• trunk/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java (modified) (1 diff)

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

@@ -444 +444 @@
     public void setKeys(TagMap keys) {
         Map<String, String> originalKeys = getKeys();
-        String[] arr = keys.getTagsArray();
-        if (arr.length == 0) {
+        if (keys == null) {
             this.keys = null;
         } else {
-            this.keys = arr;
+            String[] arr = keys.getTagsArray();
+            if (arr.length == 0) {
+                this.keys = null;
+            } else {
+                this.keys = arr;
+            }
         }
         keysChangedImpl(originalKeys);