Changeset 17358 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java

Timestamp:

2020-11-25T11:50:22+01:00 (3 years ago)

Author:

GerdP

Message:

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

• (hopefully) fix memory leaks in complex actions
• handle complex cases with presets and RelationEditor

I hope these changes don't break plugins which extend or overwrite RelationEditor

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java (modified) (3 diffs)

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

@@ -14 +14 @@
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
+import org.openstreetmap.josm.tools.Logging;
 
 /**
@@ -71 +72 @@
      *
      * @param layer the data layer the relation is a member of
-     * @param r the relation to be edited
+     * @param r the relation to be edited. If the relation doesn't belong to a {@code DataSet}
+     * callers MUST NOT use the relation after calling this method.
      * @param selectedMembers a collection of relation members which shall be selected when the editor is first launched
      * @return an instance of RelationEditor suitable for editing that kind of relation
@@ -80 +82 @@
         else {
             RelationEditor editor = new GenericRelationEditor(layer, r, selectedMembers);
+            if (r != null && r.getDataSet() == null) {
+                // see #19885: We have to assume that the relation was only created as container for tags and members
+                // the editor has created its own copy by now.
+                // Since the members point to the container we unlink them here.
+                Logging.debug("Member list is reset for relation  {0}", r.getUniqueId());
+                r.setMembers(null);
+            }
+
             RelationDialogManager.getRelationDialogManager().positionOnScreen(editor);
             RelationDialogManager.getRelationDialogManager().register(layer, r, editor);