Changeset 17357 in josm for trunk

Timestamp:

2020-11-25T11:45:20+01:00 (3 years ago)

Author:

GerdP

Message:

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

• add hint regarding memory leak in javadoc to copy constructors for Way and Relation
• decrease memory footprint of incomplete ways

Location:

trunk/src/org/openstreetmap/josm/data/osm

Files:

• Relation.java (modified) (3 diffs)
• Way.java (modified) (5 diffs)

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

@@ -194 +194 @@
 
     /**
-     * Constructs an identical clone of the argument.
+     * Constructs an identical clone of the argument and links members to it.
+     * See #19885 for possible memory leaks.
      * @param clone The relation to clone
      * @param clearMetadata If {@code true}, clears the OSM id and other metadata as defined by {@link #clearOsmMetadata}.
@@ -210 +211 @@
 
     /**
-     * Constructs an identical clone of the argument.
+     * Constructs an identical clone of the argument and links members to it.
+     * See #19885 for possible memory leaks.
      * @param clone The relation to clone
      * @param clearMetadata If {@code true}, clears the OSM id and other metadata as defined by {@link #clearOsmMetadata}.
@@ -220 +222 @@
 
     /**
-     * Create an identical clone of the argument (including the id)
+     * Create an identical clone of the argument (including the id) and links members to it.
+     * See #19885 for possible memory leaks.
      * @param clone The relation to clone, including its id
      */

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

@@ -31 +31 @@
 
     static final UniqueIdGenerator idGenerator = new UniqueIdGenerator();
+    private static final Node[] EMPTY_NODES = new Node[0];
 
     /**
      * All way nodes in this way
      */
-    private Node[] nodes = new Node[0];
+    private Node[] nodes = EMPTY_NODES;
     private BBox bbox;
 
@@ -53 +54 @@
             }
 
-            if (nodes == null) {
-                this.nodes = new Node[0];
+            if (nodes == null || nodes.isEmpty()) {
+                this.nodes = EMPTY_NODES;
             } else {
-                this.nodes = nodes.toArray(new Node[0]);
+                this.nodes = nodes.toArray(EMPTY_NODES);
             }
             for (Node node: this.nodes) {
@@ -196 +197 @@
     /**
      * Constructs a new {@code Way} from an existing {@code Way}.
+     * This  adds links from all way nodes to the clone. See #19885 for possible memory leaks.
      * @param original The original {@code Way} to be identically cloned. Must not be null
      * @param clearMetadata If {@code true}, clears the OSM id and other metadata as defined by {@link #clearOsmMetadata}.
@@ -212 +214 @@
     /**
      * Constructs a new {@code Way} from an existing {@code Way}.
+     * This  adds links from all way nodes to the clone. See #19885 for possible memory leaks.
      * @param original The original {@code Way} to be identically cloned. Must not be null
      * @param clearMetadata If {@code true}, clears the OSM id and other metadata as defined by {@link #clearOsmMetadata}.
@@ -223 +226 @@
     /**
      * Constructs a new {@code Way} from an existing {@code Way} (including its id).
+     * This  adds links from all way nodes to the clone. See #19885 for possible memory leaks.
      * @param original The original {@code Way} to be identically cloned. Must not be null
      * @since 86