Changeset 2406 in josm for trunk/src/org

Timestamp:

2009-11-08T12:21:01+01:00 (15 years ago)

Author:

jttt

Message:

Fix for #3863 InvocationTargetException downloading additional data

File:

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

trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java

@@ -135 +135 @@
         // my dataset. Just add other to my dataset.
         //
+
+        //TODO primitive must be only in one dataset at one time, so remove it from theirDataset. This obviously
+        // breaks theirDataset and we can only hope that nobody will try to use theirDataset after merging is finished
+        theirDataSet.removePrimitive(other);
         myDataset.addPrimitive(other);
     }