Changeset 17200 in josm for trunk/src/org

Timestamp:

2020-10-14T15:51:24+02:00 (4 years ago)

Author:

GerdP

Message:

see #19885: memory leak with "temporary" objects in validator and actions

• use ChangeNodesCommand

Simplifies code and avoids another memory leak

File:

• trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java (modified) (3 diffs)

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

@@ -23 +23 @@
 
 import org.openstreetmap.josm.actions.corrector.ReverseWayTagCorrector;
-import org.openstreetmap.josm.command.ChangeCommand;
+import org.openstreetmap.josm.command.ChangeNodesCommand;
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.command.DeleteCommand;
@@ -186 +186 @@
         //
         Way targetWay = getTargetWay(ways);
-        Way modifiedTargetWay = new Way(targetWay);
-        modifiedTargetWay.setNodes(path);
 
         final List<Command> resolution;
@@ -203 +201 @@
         deletedWays.remove(targetWay);
 
-        cmds.add(new ChangeCommand(dataSets.get(0), targetWay, modifiedTargetWay));
+        cmds.add(new ChangeNodesCommand(dataSets.get(0), targetWay, path));
         cmds.addAll(reverseWayTagCommands);
         cmds.addAll(resolution);