Changeset 17140 in josm for trunk/src/org

Timestamp:

2020-10-10T10:02:15+02:00 (4 years ago)

Author:

GerdP

Message:

see #19885: memory leak with "temporary" objects in validator and actions
Reduce number of memory leaks in RelationEditor when nothing is changed.

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• conflict/tags/RelationMemberConflictResolverModel.java (modified) (1 diff)
• dialogs/relation/GenericRelationEditor.java (modified) (1 diff)
• dialogs/relation/MemberTableModel.java (modified) (1 diff)
• dialogs/relation/RelationEditor.java (modified) (2 diffs)
• dialogs/relation/actions/SavingAction.java (modified) (1 diff)

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

@@ -391 +391 @@
         if (isChanged)
             return new ChangeCommand(relation, modifiedRelation);
+        modifiedRelation.setMembers(null); // see #19885
         return null;
     }

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java

@@ -951 +951 @@
                 modified = true;
             }
+            if (!modified) {
+                relation.setMembers(null); // see #19885
+            }
             return modified ? new ChangeCommand(orig, relation) : null;
         } catch (AddAbortException ign) {

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java

@@ -222 +222 @@
         members.clear();
         if (relation != null) {
-            // make sure we work with clones of the relation members in the model.
-            members.addAll(new Relation(relation).getMembers());
+            members.addAll(relation.getMembers());
         }
         fireTableDataChanged();

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java

@@ -126 +126 @@
 
     protected final void setRelationSnapshot(Relation snapshot) {
+        if (relationSnapshot != null && relationSnapshot.getDataSet() == null)
+            relationSnapshot.setMembers(null); // see #19885
+
         Relation oldValue = relationSnapshot;
         relationSnapshot = snapshot;
@@ -155 +158 @@
     public void dispose() {
         layer.setRecentRelation(relation);
+        setRelation(null);
         super.dispose();
     }

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/SavingAction.java

@@ -88 +88 @@
         if (!editedRelation.hasEqualSemanticAttributes(originRelation, false)) {
             UndoRedoHandler.getInstance().add(new ChangeCommand(originRelation, editedRelation));
+        } else {
+            editedRelation.setMembers(null); // see #19885
         }
     }