Changeset 2013 in josm

Timestamp:

Aug 30, 2009 6:53:36 PM (4 years ago)

Author:

stoecker

Message:

fix #3341 - NPE

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/downloadtasks/DownloadOsmTask.java (modified) (1 diff)
• data/osm/DataSource.java (modified) (1 diff)

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

@@ -113 +113 @@
             if (dataSet == null)
                 return; // user canceled download or error occurred
+            if (currentBounds == null) {
+                return; // no data retrieved
+            }
             if (dataSet.allPrimitives().isEmpty()) {
                 progressMonitor.setErrorMessage(tr("No data imported."));

trunk/src/org/openstreetmap/josm/data/osm/DataSource.java

@@ -11 +11 @@
         this.bounds = bounds;
         this.origin = origin;
+        if (bounds == null) {
+            throw new NullPointerException();
+        }
     }