Changeset 17226 in josm for trunk/src/org/openstreetmap/josm/command

Timestamp:

2020-10-18T11:50:39+02:00 (4 years ago)

Author:

GerdP

Message:

see #19885: memory leak with "temporary" objects in validator and actions

• initialize cloneMap as Collections.emptyMap() to reduce memory footprint for Commamds

The original code allocated a HashMap for all commands, only some require it. Typically, the map contains 0 or 1 entries, so use Utils.toUnmodifiable() to optimize further.

File:

• trunk/src/org/openstreetmap/josm/command/Command.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/command/Command.java

@@ -4 +4 @@
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.HashMap;
+import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.Map;
@@ -20 +20 @@
 import org.openstreetmap.josm.data.osm.visitor.OsmPrimitiveVisitor;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -123 +124 @@
 
     /** the map of OsmPrimitives in the original state to OsmPrimitives in cloned state */
-    private Map<OsmPrimitive, PrimitiveData> cloneMap = new HashMap<>();
+    private Map<OsmPrimitive, PrimitiveData> cloneMap = Collections.emptyMap();
 
     /** the dataset which this command is applied to */
@@ -154 +155 @@
             osm.accept(visitor);
         }
-        cloneMap = visitor.orig;
+        cloneMap = Utils.toUnmodifiableMap(visitor.orig);
         return true;
     }