Changeset 31592 in osm for applications

Timestamp:

2015-10-04T22:19:48+02:00 (9 years ago)

Author:

simon04

Message:

JOSM/reverter: Fix IllegalStateException when the first+last node of a closed way is a conflict - fixes #josm11811

File:

• applications/editors/josm/plugins/reverter/src/reverter/DataSetCommandMerger.java (modified) (2 diffs)

applications/editors/josm/plugins/reverter/src/reverter/DataSetCommandMerger.java

@@ -5 +5 @@
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.LinkedHashSet;
 import java.util.LinkedList;
 import java.util.List;
@@ -97 +98 @@
         if (!source.isVisible()) return;
         Way target = (Way)getMergeTarget(source);
-        
-        Collection<Conflict<OsmPrimitive>> localConflicts = new ArrayList<>();
+
+        // use a set to avoid conflicts being added twice for closed ways, fixes #11811
+        Collection<Conflict<OsmPrimitive>> localConflicts = new LinkedHashSet<>();
 
         List<Node> newNodes = new ArrayList<>(source.getNodesCount());