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

Timestamp:

2014-12-10T22:07:39+01:00 (11 years ago)

Author:

Don-vip

Message:

fix #10816 - add various safeguards to make sure to not upload empty keys

File:

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

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

@@ -18 +18 @@
 import java.util.concurrent.atomic.AtomicLong;
 
+import org.openstreetmap.josm.tools.Utils;
+
 /**
 * Abstract class to represent common features of the datatypes primitives.
@@ -509 +511 @@
      * removes the key and behaves like {@link #remove(String)}.
      *
-     * @param key  The key, for which the value is to be set. Can be null, does nothing in this case.
+     * @param key  The key, for which the value is to be set. Can be null or empty, does nothing in this case.
      * @param value The value for the key. If null, removes the respective key/value pair.
      *
@@ -517 +519 @@
     public void put(String key, String value) {
         Map<String, String> originalKeys = getKeys();
-        if (key == null)
+        if (key == null || Utils.strip(key).isEmpty())
             return;
         else if (value == null) {