Changeset 14951 in josm for trunk/src

Timestamp:

2019-04-01T22:10:50+02:00 (6 years ago)

Author:

GerdP

Message:

fix #17517: Memory leak in ChangesetCacheManager

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/ChangesetManagerToggleAction.java (modified) (2 diffs)
• gui/dialogs/changeset/ChangesetCacheManager.java (modified) (3 diffs)

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

@@ -46 +46 @@
             ChangesetCacheManager.getInstance().setVisible(true);
         } else {
-            ChangesetCacheManager.getInstance().removeWindowListener(changesetCacheManagerClosedHandler);
             ChangesetCacheManager.destroyInstance();
         }
@@ -56 +55 @@
             setSelected(false);
             notifySelectedState();
-            ChangesetCacheManager.getInstance().removeWindowListener(changesetCacheManagerClosedHandler);
         }
     }

trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java

@@ -65 +65 @@
 import org.openstreetmap.josm.io.NetworkManager;
 import org.openstreetmap.josm.io.OnlineResource;
-import org.openstreetmap.josm.tools.Destroyable;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.InputMapUtils;
@@ -104 +103 @@
         if (instance != null) {
             instance.setVisible(false);
+            GuiHelper.destroyComponents(instance, false);
             instance.dispose();
-            for (Component c : instance.pnlChangesetDetailTabs.getComponents()) {
-                if (c instanceof Destroyable) {
-                    ((Destroyable) c).destroy();
-                }
-            }
             instance = null;
         }
@@ -352 +347 @@
         @Override
         public void windowClosing(WindowEvent e) {
-            new CancelAction().cancelAndClose();
+            destroyInstance();
         }