Changeset 17163 in josm for trunk/src/org/openstreetmap

Timestamp:

2020-10-11T14:24:00+02:00 (4 years ago)

Author:

GerdP

Message:

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

• use ChangeNodesCommand instead of ChangeCommand
• use ChangePropertyCommand instead of ChangeCommand
• remove unused parameter

Just a small step forward...

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/JoinAreasAction.java (modified) (2 diffs)
• command/SplitWayCommand.java (modified) (5 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;
@@ -1719 +1720 @@
     private void stripTags(Collection<Way> ways) {
         for (Way w : ways) {
-            final Way wayWithoutTags = new Way(w);
-            wayWithoutTags.removeAll();
-            cmds.add(new ChangeCommand(w, wayWithoutTags));
+            cmds.add(new ChangePropertyCommand(Collections.singleton(w), Collections.emptyMap()));
         }
         /* I18N: current action printed in status display */

trunk/src/org/openstreetmap/josm/command/SplitWayCommand.java

@@ -351 +351 @@
 
         // Figure out the order of relation members (if any).
-        Analysis analysis = analyseSplit(way, wayToKeep, newWays, indexOfWayToKeep);
+        Analysis analysis = analyseSplit(way, wayToKeep, newWays);
 
         // If there are relations that cannot be split properly without downloading more members,
@@ -406 +406 @@
                 // If missing relation members were downloaded, perform the analysis again to find the relation
                 // member order for all relations.
-                analysis = analyseSplit(way, wayToKeep, newWays, indexOfWayToKeep);
+                analysis = analyseSplit(way, wayToKeep, newWays);
                 return Optional.of(splitBasedOnAnalyses(way, newWays, newSelection, analysis, indexOfWayToKeep));
             case GO_AHEAD_WITHOUT_DOWNLOADS:
@@ -421 +421 @@
     static Analysis analyseSplit(Way way,
                                  Way wayToKeep,
-                                 List<Way> newWays,
-                                 int indexOfWayToKeep) {
+                                 List<Way> newWays) {
         Collection<Command> commandList = new ArrayList<>();
         Collection<String> nowarnroles = Config.getPref().getList("way.split.roles.nowarn",
@@ -430 +429 @@
         final Way changedWay = new Way(way);
         changedWay.setNodes(wayToKeep.getNodes());
-        commandList.add(new ChangeCommand(way, changedWay));
-
+        commandList.add(new ChangeNodesCommand(way, changedWay.getNodes()));
         for (Way wayToAdd : newWays) {
             commandList.add(new AddCommand(way.getDataSet(), wayToAdd));
@@ -559 +557 @@
             }
         }
-
+        changedWay.setNodes(null); // see #19885
         return new Analysis(relationAnalyses, commandList, warnings, numberOfRelations);
     }