Changeset 3149 in josm

Timestamp:

Mar 20, 2010 12:02:36 PM (3 years ago)

Author:

jttt

Message:

Do not allow zero length arrays for OsmPrimitive.keys

File:

• trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java (modified) (6 diffs)

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

@@ -701 +701 @@
     public void setKeys(Map<String, String> keys) {
         Map<String, String> originalKeys = getKeys();
-        if (keys == null) {
+        if (keys == null || keys.isEmpty()) {
             this.keys = null;
             keysChangedImpl(originalKeys);
@@ -731 +731 @@
         else if (value == null) {
             remove(key);
-        } else if (keys == null || keys.length == 0){
+        } else if (keys == null){
             keys = new String[] {key, value};
             keysChangedImpl(originalKeys);
@@ -759 +759 @@
      */
     public final void remove(String key) {
-        if (key == null || keys == null || keys.length == 0 ) return;
+        if (key == null || keys == null) return;
         if (!hasKey(key))
             return;
@@ -803 +803 @@
         if (key == null)
             return null;
-        if (keys == null || keys.length == 0)
+        if (keys == null)
             return null;
         for (int i=0; i<keys.length;i+=2) {
@@ -812 +812 @@
 
     public final Collection<String> keySet() {
-        if (keys == null || keys.length == 0)
+        if (keys == null)
             return Collections.emptySet();
         Set<String> result = new HashSet<String>(keys.length / 2);
@@ -828 +828 @@
      */
     public final boolean hasKeys() {
-        return keys != null && keys.length != 0;
+        return keys != null;
     }