Changeset 17167 in josm for trunk/src/org

Timestamp:

2020-10-11T22:00:25+02:00 (4 years ago)

Author:

GerdP

Message:

see #19885: memory leak with "temporary" objects in validator and actions
revert changes in JoinAreasAction made in r16048. Can't use ChangePropertyCommand to remove all tags

File:

• trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java

@@ -28 +28 @@
 import org.openstreetmap.josm.command.ChangeCommand;
 import org.openstreetmap.josm.command.ChangeNodesCommand;
-import org.openstreetmap.josm.command.ChangePropertyCommand;
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.command.DeleteCommand;
@@ -1720 +1719 @@
     private void stripTags(Collection<Way> ways) {
         for (Way w : ways) {
-            cmds.add(new ChangePropertyCommand(Collections.singleton(w), Collections.emptyMap()));
+            final Way wayWithoutTags = new Way(w);
+            wayWithoutTags.removeAll();
+            cmds.add(new ChangeCommand(w, wayWithoutTags));
         }
         /* I18N: current action printed in status display */