Changeset 4178 in josm for trunk/src/org/openstreetmap/josm/data/osm

Timestamp:

2011-06-28T08:17:37+02:00 (13 years ago)

Author:

jttt

Message:

Fix #6519 NPE after opening offline osm file

File:

• trunk/src/org/openstreetmap/josm/data/osm/QuadBuckets.java (modified) (2 diffs)

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

@@ -731 +731 @@
             // search spot can not cover the current
             // search
-            while (!search_cache.bbox().bounds(search_bbox)) {
+            while (search_cache != null && !search_cache.bbox().bounds(search_bbox)) {
                 if (debug) {
                     out("bbox: " + search_bbox);
@@ -743 +743 @@
                     out("new search_cache: " + search_cache);
                 }
+            }
+
+            if (search_cache == null) {
+                search_cache = root;
+                out("bbox: " + search_bbox + " is out of the world");
             }
         } else {