Changeset 17243 in josm for trunk/src/org/openstreetmap/josm/data/validation/tests/RelationChecker.java

Timestamp:

2020-10-19T15:25:47+02:00 (4 years ago)

Author:

GerdP

Message:

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

• replace ChangeCommand by ChangePropertyCommand to avoid cloning primitives
• also move the call of super.endTest() to the end of the method endTest(), else reported timings make not much sense

File:

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

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

@@ -18 +18 @@
 import java.util.stream.Collectors;
 
-import org.openstreetmap.josm.command.ChangeCommand;
+import org.openstreetmap.josm.command.ChangeMembersCommand;
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.command.DeleteCommand;
@@ -386 +386 @@
             if (testError.getCode() == RELATION_LOOP) {
                 Relation old = (Relation) primitives.iterator().next();
-                Relation mod = new Relation(old);
-                mod.removeMembersFor(primitives);
-                return new ChangeCommand(old, mod);
+                List<RelationMember> remaining = new ArrayList<>(old.getMembers());
+                remaining.removeIf(rm -> primitives.contains(rm.getMember()));
+                return new ChangeMembersCommand(old, Utils.toUnmodifiableList(remaining));
             }
         }