Changeset 17523 in josm

Timestamp:

2021-02-22T12:27:24+01:00 (4 years ago)

Author:

Don-vip

Message:

fix #20519 - NPE in Upload Dialog

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/io/UploadDialog.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/gui/io/UploadDialogTest.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java

@@ -342 +342 @@
     /**
      * Returns the given comment with appended hashtags from dataset changeset tags, if not already present.
-     * @param comment changeset comment
+     * @param comment changeset comment. Can be null
      * @param dataSet optional dataset, which can contain hashtags in its changeset tags
      * @return comment with dataset changesets tags, if any, not duplicated
      */
-    private static String getCommentWithDataSetHashTag(String comment, DataSet dataSet) {
-        StringBuilder result = new StringBuilder(comment);
+    static String getCommentWithDataSetHashTag(String comment, DataSet dataSet) {
+        StringBuilder result = comment == null ? new StringBuilder() : new StringBuilder(comment);
         if (dataSet != null) {
             String hashtags = dataSet.getChangeSetTags().get("hashtags");

trunk/test/unit/org/openstreetmap/josm/gui/io/UploadDialogTest.java

@@ -20 +20 @@
 import org.junit.jupiter.api.extension.RegisterExtension;
 import org.openstreetmap.josm.TestUtils;
+import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.gui.io.UploadDialog.UploadAction;
 import org.openstreetmap.josm.io.UploadStrategySpecification;
@@ -195 +196 @@
         doTestValidateUploadTag("upload.source");
     }
+
+    @Test
+    void testGetCommentWithDataSetHashTag() {
+        assertEquals("", UploadDialog.getCommentWithDataSetHashTag(null, null));
+        DataSet ds = new DataSet();
+        assertEquals("foo", UploadDialog.getCommentWithDataSetHashTag("foo", ds));
+        ds.getChangeSetTags().put("hashtags", "bar");
+        assertEquals("foo #bar", UploadDialog.getCommentWithDataSetHashTag("foo", ds));
+        ds.getChangeSetTags().put("hashtags", "bar;baz;#bar");
+        assertEquals("foo #bar #baz", UploadDialog.getCommentWithDataSetHashTag("foo", ds));
+    }
 }