Changeset 17187 in josm for trunk/src

Timestamp:

2020-10-13T17:56:43+02:00 (4 years ago)

Author:

GerdP

Message:

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

• let modifyWay() return the list of nodes instead of a newly created copy of the way

Simplifies code and avoids another memory leak

File:

• trunk/src/org/openstreetmap/josm/actions/UnGlueAction.java (modified) (4 diffs)

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

@@ -188 +188 @@
         List<Command> cmds = new ArrayList<>();
         List<Node> newNodes = new ArrayList<>();
-        Way modWay = modifyWay(selectedNode, way, cmds, newNodes);
-        cmds.add(new ChangeNodesCommand(way, modWay.getNodes()));
+        cmds.add(new ChangeNodesCommand(way, modifyWay(selectedNode, way, cmds, newNodes)));
         if (dialog != null) {
             update(dialog, selectedNode, newNodes, cmds);
@@ -301 +300 @@
      * @return new way The modified way. Change command must be handled by the caller
      */
-    private static Way modifyWay(Node originalNode, Way w, List<Command> cmds, List<Node> newNodes) {
+    private static List<Node> modifyWay(Node originalNode, Way w, List<Command> cmds, List<Node> newNodes) {
         // clone the node for the way
         Node newNode = cloneNode(originalNode, cmds);
@@ -308 +307 @@
         List<Node> nn = new ArrayList<>(w.getNodes());
         nn.replaceAll(n -> n == originalNode ? newNode : n);
-        Way newWay = new Way(w);
-        newWay.setNodes(nn);
-
-        return newWay;
+        return nn;
     }
 
@@ -393 +389 @@
             if (w.isFirstLastNode(selectedNode))
                 warnParents.add(w);
-            cmds.add(new ChangeNodesCommand(w, modifyWay(selectedNode, w, cmds, newNodes).getNodes()));
+            cmds.add(new ChangeNodesCommand(w, modifyWay(selectedNode, w, cmds, newNodes)));
         }