Changeset 13066 in josm for trunk/src/org/openstreetmap

Timestamp:

2017-11-01T14:35:33+01:00 (6 years ago)

Author:

Don-vip

Message:

see #12347 - NPE

File:

• trunk/src/org/openstreetmap/josm/command/SplitWayCommand.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/command/SplitWayCommand.java

@@ -443 +443 @@
 
     static OsmPrimitive findVia(Relation r, String type) {
-        switch (type) {
-        case "restriction":
-            return findRelationMember(r, "via").orElse(null);
-        case "destination_sign":
-            // Prefer intersection over sign, see #12347
-            return findRelationMember(r, "intersection").orElse(findRelationMember(r, "sign").orElse(null));
-        default:
-            return null;
-        }
+        if (type != null) {
+            switch (type) {
+            case "restriction":
+                return findRelationMember(r, "via").orElse(null);
+            case "destination_sign":
+                // Prefer intersection over sign, see #12347
+                return findRelationMember(r, "intersection").orElse(findRelationMember(r, "sign").orElse(null));
+            default:
+                return null;
+            }
+        }
+        return null;
     }