Changeset 4661 in josm for trunk/src/org


Ignore:
Timestamp:
2011-12-13T13:10:40+01:00 (9 years ago)
Author:
Don-vip
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmChangeTask.java

    r4530 r4661  
    6363        protected void finish() {
    6464            super.finish();
     65            if (isFailed() || isCanceled() || downloadedData == null)
     66                return; // user canceled download or error occurred
    6567            progressMonitor.subTask(tr("Updating data"));
    6668            UpdatePrimitivesTask task = new UpdatePrimitivesTask(targetLayer, downloadedData.allPrimitives());
Note: See TracChangeset for help on using the changeset viewer.