Changeset 17047 in josm for trunk

Timestamp:

2020-09-20T10:43:08+02:00 (4 years ago)

Author:

GerdP

Message:

fix #19789: memory leak with gpx waypoints

• implement destroy in class Marker and call it for each object in a destroyed MarkerLayer
• handle also AbstractModifiableLayer in AutosaveTask

Location:

trunk/src/org/openstreetmap/josm/gui/layer

Files:

• AutosaveTask.java (modified) (1 diff)
• markerlayer/Marker.java (modified) (6 diffs)
• markerlayer/MarkerLayer.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/layer/AutosaveTask.java

@@ -316 +316 @@
                 noteLayer.getNoteData().removeNoteDataUpdateListener(this);
                 cleanupLayer(noteLayer);
+            }
+        } else if (e.getRemovedLayer() instanceof AbstractModifiableLayer) {
+            synchronized (layersLock) {
+                cleanupLayer((AbstractModifiableLayer) e.getRemovedLayer());
             }
         }

trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java

@@ -32 +32 @@
 import org.openstreetmap.josm.gui.layer.GpxLayer;
 import org.openstreetmap.josm.gui.preferences.display.GPXSettingsPanel;
+import org.openstreetmap.josm.spi.preferences.PreferenceChangedListener;
+import org.openstreetmap.josm.tools.Destroyable;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Logging;
@@ -74 +76 @@
  * @author Frederik Ramm
  */
-public class Marker implements TemplateEngineDataProvider, ILatLon {
+public class Marker implements TemplateEngineDataProvider, ILatLon, Destroyable {
 
     /**
@@ -148 +150 @@
 
     private CachedLatLon coor;
+    private PreferenceChangedListener listener = l -> updateText();
 
     private boolean erroneous;
@@ -175 +178 @@
         this.text = text;
 
-        Preferences.main().addKeyPreferenceChangeListener("draw.rawgps." + getTextTemplateKey(), l -> updateText());
+        Preferences.main().addKeyPreferenceChangeListener(getPreferenceKey(), listener);
     }
 
@@ -370 +373 @@
         cachedText = null;
         cachedDefaultTemplate = null;
-        cachedTemplates = new HashMap<>();
+        cachedTemplates.clear();
     }
 
@@ -433 +436 @@
         }
     }
+
+    @Override
+    public void destroy() {
+        cachedTemplates.clear();
+        Preferences.main().removeKeyPreferenceChangeListener(getPreferenceKey(), listener);
+    }
+
+    private String getPreferenceKey() {
+        return "draw.rawgps." + getTextTemplateKey();
+    }
 }

trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java

@@ -172 +172 @@
         currentMarker = null;
         fromLayer = null;
+        data.forEach(Marker::destroy);
         data.clear();
         super.destroy();