Ticket #23419: 23419.patch

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

@@ -155 +155 @@
      * @throws UserCancelException when the user has cancelled the save process
      */
     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;
         }
@@ -368 +376 @@
         }
 
         /**
-         * Initializes action.
+         * Initializes some action fields.
          */
-        public final void initialize() {
+        private void initialize() {
             layers = new ArrayList<>(getLayerManager().getLayers());
             exporters = new HashMap<>();
             dependencies = new MultiMap<>();
@@ -612 +620 @@
         return false;
     }
 
+    protected void cleanup() {
+        layers = null;
+        exporters = null;
+        dependencies = null;
+    }
+
 }