Changeset 17439 in josm for trunk/src/org

Timestamp:

2021-01-04T16:51:24+01:00 (4 years ago)

Author:

GerdP

Message:

see #17184: Memory leaks

• implement method clear() in GpxData and call it when the GpxLayer is destroyed

Reduces memory leak when GPX layers are merged. Without this change GC seems to be unable to free the memory for WayPoints

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/gpx/GpxData.java (modified) (1 diff)
• gui/layer/GpxLayer.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/gpx/GpxData.java

@@ -1274 +1274 @@
         }
     }
+
+    /**
+     * Removes all gpx elements
+     * @since 17439
+     */
+    public void clear() {
+        dataSources.clear();
+        layerPrefs.clear();
+        privateRoutes.clear();
+        privateTracks.clear();
+        privateWaypoints.clear();
+        attr.clear();
+    }
 }

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

@@ -618 +618 @@
         }
     }
+
+    @Override
+    public synchronized void destroy() {
+        data.clear();
+        data = null;
+        super.destroy();
+    }
 }