Changeset 11836 in josm

Timestamp:

2017-04-04T12:54:43+02:00 (7 years ago)

Author:

bastiK

Message:

fixed #14604 - Error on import

File:

• trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java

@@ -8 +8 @@
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.Optional;
@@ -292 +293 @@
          * Look for primitives deleted on server (thus absent from downloaded data)
          * but still present in existing data layer
-         * @param b download bounds
+         * @param bounds download bounds
          * @param ds existing data set
          * @return the primitives to update
          */
-        private Collection<OsmPrimitive> searchPrimitivesToUpdate(Bounds b, DataSet ds) {
+        private Collection<OsmPrimitive> searchPrimitivesToUpdate(Bounds bounds, DataSet ds) {
+            if (bounds == null)
+                return Collections.EMPTY_SET;
             Collection<OsmPrimitive> col = new ArrayList<>();
-            ds.searchNodes(b.toBBox()).stream().filter(n -> !n.isNew() && !dataSet.containsNode(n)).forEachOrdered(col::add);
+            ds.searchNodes(bounds.toBBox()).stream().filter(n -> !n.isNew() && !dataSet.containsNode(n)).forEachOrdered(col::add);
             if (!col.isEmpty()) {
                 Set<Way> ways = new HashSet<>();