Changeset 17367 in josm for trunk/src/org

Timestamp:

2020-11-27T15:37:14+01:00 (3 years ago)

Author:

GerdP

Message:

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

• simplify code in SplitWayCommand, no need to create a way when we only need to know the nodes

File:

• trunk/src/org/openstreetmap/josm/command/SplitWayCommand.java (modified) (5 diffs)

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

@@ -436 +436 @@
 
         // Change the original way
-        final Way changedWay = new Way(way);
-        changedWay.setNodes(wayToKeep.getNodes());
-        commandList.add(new ChangeNodesCommand(way, changedWay.getNodes()));
+        final List<Node> changedWayNodes = wayToKeep.getNodes();
+        commandList.add(new ChangeNodesCommand(way, changedWayNodes));
         for (Way wayToAdd : newWays) {
             commandList.add(new AddCommand(way.getDataSet(), wayToAdd));
@@ -465 +464 @@
                     boolean insert = true;
                     if (relationSpecialTypes.containsKey(type) && "restriction".equals(relationSpecialTypes.get(type))) {
-                        RelationInformation rValue = treatAsRestriction(r, rm, c, newWays, way, changedWay);
+                        RelationInformation rValue = treatAsRestriction(r, rm, c, newWays, way, changedWayNodes);
                         if (rValue.warnme) warnings.add(WarningType.GENERIC);
                         insert = rValue.insert;
@@ -570 +569 @@
             }
         }
-        changedWay.setNodes(null); // see #19885
         return new Analysis(relationAnalyses, commandList, warnings, numberOfRelations);
     }
@@ -785 +783 @@
     private static RelationInformation treatAsRestriction(Relation r,
             RelationMember rm, Relation c, Collection<Way> newWays, Way way,
-            Way changedWay) {
+            List<Node> changedWayNodes) {
         RelationInformation relationInformation = new RelationInformation();
         /* this code assumes the restriction is correct. No real error checking done */
@@ -802 +800 @@
             Way res = null;
             for (Node n : nodes) {
-                if (changedWay.isFirstLastNode(n)) {
+                if (changedWayNodes.get(0) == n || changedWayNodes.get(changedWayNodes.size() - 1) == n) {
                     res = way;
                 }