Ticket #11653: getkeys.patch

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

@@ -470 +470 @@
      */
     @Override
     public Map<String, String> getKeys() {
-        Map<String, String> result = new HashMap<>();
-        String[] keys = this.keys;
-        if (keys != null) {
-            for (int i = 0; i < keys.length; i += 2) {
-                result.put(keys[i], keys[i + 1]);
-            }
+        final String[] keys = this.keys;
+        if (keys == null || keys.length == 0) {
+            return Collections.emptyMap();
         }
+        if (keys.length == 2) {
+            return Collections.singletonMap(keys[0], keys[1]);
+        }
+
+        final Map<String, String> result = new HashMap<>();
+        for (int i = 0; i < keys.length; i += 2) {
+            result.put(keys[i], keys[i + 1]);
+        }
+
         return result;
     }