Changeset 17232 in josm for trunk/src

Timestamp:

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

Author:

simon04

Message:

fix #19960 - NPE in OsmJsonReader.readRelationMembersAndTags

File:

• trunk/src/org/openstreetmap/josm/io/OsmJsonReader.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);