Changeset 4684 in josm for trunk/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java

Timestamp:

2011-12-21T12:58:59+01:00 (12 years ago)

Author:

Don-vip

Message:

see #7159 - Layer merging performance

File:

• trunk/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java (modified) (1 diff)

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

@@ -648 +648 @@
      */
     public boolean hasSameTags(OsmPrimitive other) {
-        return getKeys().equals(other.getKeys());
+        // We cannot directly use Arrays.equals(keys, other.keys) as keys is not ordered by key
+        // but we can at least check if both arrays are null or of the same size before creating 
+        // and comparing the key maps (costly operation, see #7159)
+        return (keys == null && other.keys == null) 
+            || (keys != null && other.keys != null && keys.length == other.keys.length && (keys.length == 0 || getKeys().equals(other.getKeys())));
     }