Changeset 8961 in josm for trunk/src/org

Timestamp:

2015-10-27T23:19:34+01:00 (9 years ago)

Author:

Don-vip

Message:

fix #12019 - NPE with ChangePropertyCommand called on objects without dataset - regression from r8941

File:

• trunk/src/org/openstreetmap/josm/command/ChangePropertyCommand.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/command/ChangePropertyCommand.java

@@ -111 +111 @@
             return true;
         final DataSet dataSet = objects.get(0).getDataSet();
-        dataSet.beginUpdate();
+        if (dataSet != null) {
+            dataSet.beginUpdate();
+        }
         try {
             super.executeCommand(); // save old
@@ -133 +135 @@
             return true;
         } finally {
-            dataSet.endUpdate();
+            if (dataSet != null) {
+                dataSet.endUpdate();
+            }
         }
     }