Changeset 35560 in osm for applications/editors/josm

Timestamp:

2020-09-28T15:25:56+02:00 (4 years ago)

Author:

GerdP

Message:

fix #19856: DataIntegrityProblemException: Primitive must be part of the dataset

• make sure that global fields are properly initialized

File:

• applications/editors/josm/plugins/terracer/src/org/openstreetmap/josm/plugins/terracer/TerracerAction.java (modified) (3 diffs)

applications/editors/josm/plugins/terracer/src/org/openstreetmap/josm/plugins/terracer/TerracerAction.java

@@ -104 +104 @@
     @Override
     public void actionPerformed(ActionEvent e) {
+        cleanup();
         Collection<OsmPrimitive> sel = getLayerManager().getEditDataSet().getSelected();
         Way outline = null;
@@ -220 +221 @@
             } catch (UserCancelException ex) {
                 Logging.trace(ex);
-            } finally {
-                this.commands.clear();
-                this.commands = null;
             }
         } else {
@@ -230 +228 @@
                     associatedStreet, housenumbers, title).dialog.showDialog();
         }
+        cleanup();
+    }
+
+    private void cleanup() {
+        commands = null;
+        primitives = null;
+        tagsInConflict = null;
     }