Changeset 7658 in josm for trunk

Timestamp:

2014-10-27T21:32:23+01:00 (9 years ago)

Author:

Don-vip

Message:

fix unit tests broken in r7656

File:

• trunk/src/org/openstreetmap/josm/io/DiffResultProcessor.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/io/DiffResultProcessor.java

@@ -109 +109 @@
             monitor = NullProgressMonitor.INSTANCE;
         }
-        DataSet ds = primitives.iterator().next().getDataSet();
-        ds.beginUpdate();
+        DataSet ds = null;
+        if (!primitives.isEmpty()) {
+            ds = primitives.iterator().next().getDataSet();
+        }
+        if (ds != null) {
+            ds.beginUpdate();
+        }
         try {
             monitor.beginTask("Postprocessing uploaded data ...");
@@ -134 +139 @@
             return processed;
         } finally {
-            ds.endUpdate();
+            if (ds != null) {
+                ds.endUpdate();
+            }
             monitor.finishTask();
         }