Changeset 17232 in josm

Timestamp:

2020-10-18T12:49:23+02:00 (4 years ago)

Author:

simon04

Message:

fix #19960 - NPE in OsmJsonReader.readRelationMembersAndTags

Location:

trunk

Files:

• src/org/openstreetmap/josm/io/OsmJsonReader.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/io/OsmJsonReaderTest.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/io/OsmJsonReader.java

@@ -157 +157 @@
     private void readRelationMembersAndTags(JsonObject item, Relation r, Collection<RelationMemberData> members)
             throws IllegalDataException {
-        for (JsonValue v : item.getJsonArray("members")) {
-            JsonObject o = v.asJsonObject();
-            members.add(parseRelationMember(r, ((JsonNumber) o.get("ref")).longValue(), o.getString("type"), o.getString("role")));
+        JsonArray jsonArray = item.getJsonArray("members");
+        if (jsonArray != null) {
+            for (JsonValue v : jsonArray) {
+                JsonObject o = v.asJsonObject();
+                members.add(parseRelationMember(r, ((JsonNumber) o.get("ref")).longValue(), o.getString("type"), o.getString("role")));
+            }
         }
         readTags(item, r);

trunk/test/unit/org/openstreetmap/josm/io/OsmJsonReaderTest.java

@@ -236 +236 @@
         assertTrue(r.isTagged());
         assertEquals("route", r.get("type"));
+
+    }
+
+    /**
+     * Test a relation example without members.
+     * @throws Exception never
+     */
+    @Test
+    public void testEmptyRelation() throws Exception {
+        DataSet ds = parse("{\n" +
+                "  \"type\": \"relation\",\n" +
+                "  \"id\": 1,\n" +
+                "  \"tags\": {}\n" +
+                "}");
+        Relation r = ds.getRelations().iterator().next();
+        assertEquals(1, r.getUniqueId());
+        assertEquals(0, r.getMembersCount());
     }