Changeset 33224 in osm for applications/editors/josm/plugins/sds/src/org

Timestamp:

2017-04-12T00:14:55+02:00 (8 years ago)

Author:

donvip

Message:

fix #josm14639 - NPE at DetermineSdsModificationsUploadHook.checkUpload

File:

• applications/editors/josm/plugins/sds/src/org/openstreetmap/hot/sds/DetermineSdsModificationsUploadHook.java (modified) (1 diff)

applications/editors/josm/plugins/sds/src/org/openstreetmap/hot/sds/DetermineSdsModificationsUploadHook.java

@@ -60 +60 @@
            for (String key : upd.keySet()) {
                allKeys.add(key);
-               if (!specialTags && isSpecialKey(key)) specialTags = true;
+               if (!specialTags && isSpecialKey(key))
+                   specialTags = true;
            }
 
            // process tags of old object
            IPrimitive old = plugin.getOriginalPrimitive(upd);
-           for (String key : old.keySet()) {
-               allKeys.add(key);
-              if (!specialTags && isSpecialKey(key)) specialTags = true;
+           if (old != null) {
+               for (String key : old.keySet()) {
+                   allKeys.add(key);
+                   if (!specialTags && isSpecialKey(key))
+                       specialTags = true;
+               }
            }