Changeset 18942 in josm for trunk

Timestamp:

2024-01-19T09:11:18+01:00 (11 months ago)

Author:

GerdP

Message:

fix #23419: Memory leak in SessionSaveAction

• don't keep references to the layers

File:

• trunk/src/org/openstreetmap/josm/actions/SessionSaveAction.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/actions/SessionSaveAction.java

@@ -156 +156 @@
      */
     public boolean saveSession(boolean saveAs, boolean forceSaveAll) throws UserCancelException {
+        try {
+            return saveSessionImpl(saveAs, forceSaveAll);
+        } finally {
+            cleanup();
+        }
+    }
+
+    private boolean saveSessionImpl(boolean saveAs, boolean forceSaveAll) throws UserCancelException {
         if (!isEnabled()) {
             return false;
@@ -369 +377 @@
 
         /**
-         * Initializes action.
+         * Initializes some action fields.
          */
-        public final void initialize() {
+        private void initialize() {
             layers = new ArrayList<>(getLayerManager().getLayers());
             exporters = new HashMap<>();
@@ -613 +621 @@
     }
 
+    protected void cleanup() {
+        layers = null;
+        exporters = null;
+        dependencies = null;
+    }
+
 }