Changeset 2425 in josm for trunk/src/org/openstreetmap/josm

Timestamp:

2009-11-10T01:49:10+01:00 (14 years ago)

Author:

hansendc

Message:

Fix null pointer exception when removing some nodes

File:

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

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

@@ -241 +241 @@
             return "Way??";
         }
-        boolean remove_content(T o)
+        synchronized boolean remove_content(T o)
         {
             boolean ret = this.content.remove(o);
@@ -798 +798 @@
             return QuadTiling.tile2LatLon(this.quad);
         }
+        boolean hasChildren()
+        {
+            if (children == null)
+                return false;
+
+            for (QBLevel child : children) {
+                if (child != null)
+                    return true;
+            }
+            return false;
+        }
         void remove_from_parent()
         {
@@ -810 +821 @@
                 if (sibling != this)
                     continue;
-                if (this.content != null ||
-                    this.children != null)
-                    abort("attempt to remove non-empty child");
+                if (!canRemove())
+                    abort("attempt to remove non-empty child: " + this.content + " " + this.children);
                 parent.children[i] = null;
                 nr_siblings--;
@@ -823 +833 @@
             if (content != null && content.size() > 0)
                 return false;
-            if (children != null) {
-                for (QBLevel child : children) {
-                    if (child != null)
-                        return false;
-                }
-            }
+            if (this.hasChildren())
+                return false;
             return true;
         }