Changeset 17471 in josm for trunk

Timestamp:

2021-01-19T07:27:13+01:00 (4 years ago)

Author:

GerdP

Message:

see #17184: Memory leaks

• use String.intern() for field role in RelationMemberData constructor.
• clear HistoryDataSet when last HistoryBrowserDialog instance is closed

We have route relations with +1000 members and +1000 versions. It's probably not a good idea to create all the RelationMemberData instances in advance. Will open a separate ticket for that.

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/RelationMemberData.java (modified) (1 diff)
• data/osm/history/HistoryDataSet.java (modified) (1 diff)
• gui/history/HistoryBrowserDialogManager.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/osm/RelationMemberData.java

@@ -27 +27 @@
     public RelationMemberData(String role, OsmPrimitiveType type, long id) {
         CheckParameterUtil.ensureParameterNotNull(type, "type");
-        this.role = role == null ? "" : role;
+        this.role = (role == null ? "" : role).intern();
         this.memberType = type;
         this.memberId = id;

trunk/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java

@@ -216 +216 @@
         if (!MainApplication.isDisplayingMapView()) return;
         if (MainApplication.getLayerManager().getLayers().isEmpty()) {
-            data.clear();
-            fireCacheCleared();
-        }
+            clear();
+        }
+    }
+
+    /**
+     * Clear the history data.
+     * @since 17471
+     */
+    public void clear() {
+        data.clear();
+        fireCacheCleared();
     }
 }

trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialogManager.java

@@ -120 +120 @@
             // see #17270: set focus to last dialog
             new LinkedList<>(dialogs.values()).getLast().toFront();
+        } else {
+            // we always reload the history, so there is no need to keep it in the cache.
+            HistoryDataSet.getInstance().clear();
         }
     }