Changeset 17190 in josm

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.

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/osm/DataSet.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/data/osm/DataSetTest.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);

trunk/test/unit/org/openstreetmap/josm/data/osm/DataSetTest.java

@@ -160 +160 @@
 
     /**
+     * Non-regression test for <a href="https://josm.openstreetmap.de/ticket/14186">Bug #14186</a>.
+     */
+    @Test
+    public void testTicket19438() {
+        final DataSet ds = new DataSet();
+        Node n1 = new Node(1);
+        Node n2 = new Node(2);
+        Node n3 = new Node(3);
+        Way w1 = new Way(1);
+        w1.setNodes(Arrays.asList(n1, n2, n3, n1));
+        ds.addPrimitive(n1);
+        ds.addPrimitive(n2);
+        ds.addPrimitive(n3);
+        ds.addPrimitive(w1);
+        ds.unlinkNodeFromWays(n1);
+        assertEquals(2, w1.getRealNodesCount());
+    }
+
+    /**
      * Test the selection order.
      * See <a href="https://josm.openstreetmap.de/ticket/14737">#14737</a>