Changeset 4661 in josm for trunk/src/org

Timestamp:

2011-12-13T13:10:40+01:00 (14 years ago)

Author:

Don-vip

Message:

fix #7135 - NPE when cancelling a download request not responding

File:

• trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmChangeTask.java (modified) (1 diff)

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

@@ -63 +63 @@
         protected void finish() {
             super.finish();
+            if (isFailed() || isCanceled() || downloadedData == null)
+                return; // user canceled download or error occurred
             progressMonitor.subTask(tr("Updating data"));
             UpdatePrimitivesTask task = new UpdatePrimitivesTask(targetLayer, downloadedData.allPrimitives());