Changeset 8574 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

2015-07-05T22:14:49+02:00 (10 years ago)

Author:

bastiK

Message:

applied #11655 - memory optimization (patch by shinigami, modified)

File:

• trunk/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java (modified) (2 diffs)

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

@@ -487 +487 @@
         }
 
-        final Map<String, String> result = new HashMap<>();
+        final Map<String, String> result = new HashMap<>(Utils.hashMapInitialCapacity(keys.length / 2));
         for (int i = 0; i < keys.length; i += 2) {
             result.put(keys[i], keys[i + 1]);
@@ -654 +654 @@
     @Override
     public final Collection<String> keySet() {
-        String[] keys = this.keys;
-        if (keys == null)
+        final String[] keys = this.keys;
+        if (keys == null){
             return Collections.emptySet();
-        Set<String> result = new HashSet<>(keys.length / 2);
+        }
+        if (keys.length == 1){
+            return Collections.singleton(keys[0]);
+        }
+
+        final Set<String> result = new HashSet<>(Utils.hashMapInitialCapacity(keys.length / 2));
         for (int i = 0; i < keys.length; i += 2) {
             result.add(keys[i]);