Changeset 18006 in josm

Timestamp:

2021-07-12T13:33:02+02:00 (3 years ago)

Author:

Don-vip

Message:

fix NPE in TagMap constructor

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/osm/TagMap.java (modified) (4 diffs)
• test/unit/org/openstreetmap/josm/data/osm/TagMapTest.java (modified) (2 diffs)

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

@@ -7 +7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collection;
 import java.util.ConcurrentModificationException;
 import java.util.Iterator;
@@ -75 +74 @@
             throw new UnsupportedOperationException();
         }
-
     }
 
@@ -103 +101 @@
             return tags.length / 2;
         }
-
     }
 
@@ -158 +155 @@
      * @since 10736
      */
-    public TagMap(Collection<Tag> tags) {
+    public TagMap(Iterable<Tag> tags) {
+        this.tags = EMPTY_TAGS;
         for (Tag tag : tags) {
             put(tag.getKey(), tag.getValue());

trunk/test/unit/org/openstreetmap/josm/data/osm/TagMapTest.java

@@ -3 +3 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.util.Arrays;
 
 import org.junit.jupiter.api.Test;
@@ -18 +20 @@
         assertEquals("TagMap[]", new TagMap().toString());
         assertEquals("TagMap[key=val]", new TagMap(new String[]{"key", "val"}).toString());
-        assertEquals("TagMap[key=val,foo=bar]", new TagMap(new String[]{"key", "val", "foo", "bar"}).toString());
+        TagMap foobar = new TagMap(new String[]{"key", "val", "foo", "bar"});
+        assertEquals("TagMap[key=val,foo=bar]", foobar.toString());
+        assertEquals("TagMap[key=val,foo=bar]", new TagMap(foobar).toString());
+        TagCollection coll = new TagCollection(Arrays.asList(new Tag("a", "b")));
+        assertEquals("TagMap[a=b]", new TagMap(coll).toString());
     }
 }