Changeset 17221 in josm for trunk

Timestamp:

2020-10-17T10:23:03+02:00 (4 years ago)

Author:

GerdP

Message:

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

• no need to clone relation, replace ChangeCommand by ChangeMembersCommand

Simplifies code and fixes memory leak

File:

• trunk/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java

@@ -19 +19 @@
 import java.util.stream.IntStream;
 
-import org.openstreetmap.josm.command.ChangeCommand;
+import org.openstreetmap.josm.command.ChangeMembersCommand;
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.data.coor.EastNorth;
@@ -743 +743 @@
             if (primitives.size() >= 2 && primitives.get(0) instanceof Relation) {
                 Relation oldRel = (Relation) primitives.get(0);
-                Relation newRel = new Relation(oldRel);
                 List<OsmPrimitive> repeatedPrims = primitives.subList(1, primitives.size());
                 List<RelationMember> oldMembers = oldRel.getMembers();
@@ -752 +751 @@
                 for (RelationMember rm : oldMembers) {
                     if (toRemove.contains(rm.getMember())) {
-                        if (!found.contains(rm.getMember())) {
-                            found.add(rm.getMember());
+                        if (found.add(rm.getMember())) {
                             newMembers.add(rm);
                         }
@@ -760 +758 @@
                     }
                 }
-                newRel.setMembers(newMembers);
-                return new ChangeCommand(oldRel, newRel);
+                return new ChangeMembersCommand(oldRel, newMembers);
             }
         }