Changeset 17190 in josm for trunk/src

Timestamp:

2020-10-13T21:03:27+02:00 (4 years ago)

Author:

GerdP

Message:

fix #19438: DataIntegrityProblemException: Deleted node referenced during conflict solving
Let Dataset.unlinkNodeFromWays() remove all links, not only the first one.

File:

• trunk/src/org/openstreetmap/josm/data/osm/DataSet.java (modified) (1 diff)

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

@@ -793 +793 @@
             for (Way way : node.getParentWays()) {
                 List<Node> wayNodes = way.getNodes();
-                if (wayNodes.remove(node)) {
+                wayNodes.removeIf(node::equals);
+                if (wayNodes.size() < way.getNodesCount()) {
                     if (wayNodes.size() < 2) {
                         deleteWay(way);