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

Timestamp:

2020-10-10T07:32:49+02:00 (4 years ago)

Author:

GerdP

Message:

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

• use ChangeNodesCommand instead of ChangeCommand
• remove fake parent way in AlignInCircleAction

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/AlignInCircleAction.java (modified) (1 diff)
• command/DeleteCommand.java (modified) (2 diffs)

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

@@ -120 +120 @@
             Way closedWay = new Way(w);
             closedWay.addNode(w.firstNode());
-            List<Way> usedWays = new ArrayList<>(1);
-            usedWays.add(closedWay);
-            nodes = collectNodesAnticlockwise(usedWays);
+            nodes = collectNodesAnticlockwise(Collections.singletonList(closedWay));
+            closedWay.setNodes(null);
         } else if (!ways.isEmpty() && checkWaysArePolygon(ways)) {
             // Case 2

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

@@ -489 +489 @@
             n.addAll(ws.way.getNodes().subList(0, ws.lowerIndex + 1));
 
-            Way wnew = new Way(ws.way);
-            wnew.setNodes(n);
-
-            return new ChangeCommand(ws.way, wnew);
+            return new ChangeNodesCommand(ws.way, n);
         }
 
@@ -501 +498 @@
         n2.addAll(ws.way.getNodes().subList(ws.lowerIndex + 1, ws.way.getNodesCount()));
 
-        Way wnew = new Way(ws.way);
-
         if (n1.size() < 2) {
-            wnew.setNodes(n2);
-            return new ChangeCommand(ws.way, wnew);
+            return new ChangeNodesCommand(ws.way, n2);
         } else if (n2.size() < 2) {
-            wnew.setNodes(n1);
-            return new ChangeCommand(ws.way, wnew);
+            return new ChangeNodesCommand(ws.way, n1);
         } else {
             return SplitWayCommand.splitWay(ws.way, Arrays.asList(n1, n2), Collections.<OsmPrimitive>emptyList());