Ticket #21256: 21256.patch

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

@@ -387 +387 @@
      * @see #getChangeSetTags
      */
     public void addChangeSetTag(String k, String v) {
-        this.changeSetTags.put(k, v);
+        if (v != null) {
+            this.changeSetTags.put(k, v);
+        } else {
+            this.changeSetTags.remove(k);
+        }
     }
 
     @Override

src/org/openstreetmap/josm/io/remotecontrol/handler/LoadAndZoomHandler.java

@@ -254 +254 @@
                 if (ds != null) {
                     for (String tag : Arrays.asList("changeset_comment", "changeset_source", "changeset_hashtags")) {
                         if (args.containsKey(tag)) {
-                            ds.addChangeSetTag(tag.substring("changeset_".length()), args.get(tag));
+                            final String tagKey = tag.substring("changeset_".length());
+                            final String value = args.get(tag);
+                            if (!Utils.isStripEmpty(value)) {
+                                ds.addChangeSetTag(tagKey, value);
+                            } else {
+                                ds.addChangeSetTag(tagKey, null);
+                            }
                         }
                     }
                 }