Changeset 17220 in josm for trunk

Timestamp:

2020-10-17T10:12:29+02:00 (4 years ago)

Author:

GerdP

Message:

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

• replace ChangeCommand by ChangeMembersCommand

File:

• trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverModel.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverModel.java

@@ -20 +20 @@
 import javax.swing.table.DefaultTableModel;
 
-import org.openstreetmap.josm.command.ChangeCommand;
+import org.openstreetmap.josm.command.ChangeMembersCommand;
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.data.osm.Node;
@@ -364 +364 @@
 
     protected Command buildResolveCommand(Relation relation, OsmPrimitive newPrimitive) {
-        final Relation modifiedRelation = new Relation(relation);
-        modifiedRelation.setMembers(null);
+        List<RelationMember> modifiedMemberList = new ArrayList<>();
         boolean isChanged = false;
         for (int i = 0; i < relation.getMembersCount(); i++) {
@@ -371 +370 @@
             RelationMemberConflictDecision decision = getDecision(relation, i);
             if (decision == null) {
-                modifiedRelation.addMember(member);
+                modifiedMemberList.add(member);
             } else {
                 switch(decision.getDecision()) {
                 case KEEP:
                     final RelationMember newMember = new RelationMember(decision.getRole(), newPrimitive);
-                    modifiedRelation.addMember(newMember);
+                    modifiedMemberList.add(newMember);
                     isChanged |= !member.equals(newMember);
                     break;
@@ -389 +388 @@
             }
         }
-        if (isChanged)
-            return new ChangeCommand(relation, modifiedRelation);
-        modifiedRelation.setMembers(null); // see #19885
-        return null;
+        return isChanged ? new ChangeMembersCommand(relation, modifiedMemberList) : null;
     }