Changeset 17523 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

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

Author:

Don-vip

Message:

fix #20519 - NPE in Upload Dialog

File:

• trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java (modified) (1 diff)

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");