Changeset 5654 in josm for trunk/src/org

Timestamp:

2013-01-01T19:18:21+01:00 (12 years ago)

Author:

Don-vip

Message:

fix #8313 - NPE in download OSM task

File:

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

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

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import java.awt.geom.Area;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -266 +267 @@
                     targetLayer = getFirstDataLayer();
                 }
-                isUpdateData = targetLayer.data.getDataSourceArea().contains(currentBounds.asRect());
+                Area dataSourceArea = targetLayer.data.getDataSourceArea();
+                if (dataSourceArea != null) {
+                    isUpdateData = dataSourceArea.contains(currentBounds.asRect());
+                }
                 targetLayer.mergeFrom(dataSet);
                 computeBboxAndCenterScale();