Changeset 500 in josm for trunk/src/org

Timestamp:

2007-12-29T17:19:47+01:00 (17 years ago)

Author:

gebner

Message:

Fix ConcurrentModificationException in DeleteAction.

Note: Don't EVER modify a hash table while iterating over it. Even if you
don't cause a resize (and get an exception), sometimes you will see the
modifications immediately during the iteration and sometimes not, creating
seemingly unpredictable behavior.

File:

• trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java

@@ -176 +176 @@
                 Collection<OsmPrimitive> del = new HashSet<OsmPrimitive>(selection);
                 Collection<Way> waysToBeChanged = new HashSet<Way>();
-                
-                // nodes belonging to a way will be deleted if
-                // 1. this has been requested (alt modifier)
-                // 2. the node is not tagged
-                // 3. the node is not used by anybody else (i.e. has only one backref)
+
                 if (alsoDeleteNodesInWay) {
+                        // Delete untagged nodes that are to be unreferenced.
+                        Collection<OsmPrimitive> delNodes = new HashSet<OsmPrimitive>();
                         for (OsmPrimitive osm : del) {
                                 if (osm instanceof Way) {
@@ -189 +187 @@
                                                         n.visit(v);
                                                         if (v.data.size() == 1) {
-                                                                del.add(n);
-                                                        } else System.out.println("size="+v.data.size());
+                                                                delNodes.add(n);
+                                                        }
                                                 }
-                                                else System.out.println("tagged");
                                         }
                                 }
                         }
+                        del.addAll(delNodes);
                 }