Changeset 15747 in josm for trunk

Timestamp:

2020-01-22T18:40:09+01:00 (4 years ago)

Author:

simon04

Message:

see #18591 - fix CCE, fix NPE

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/WayConnectionTypeCalculator.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/WayConnectionTypeCalculator.java

@@ -76 +76 @@
         if (isSuperRoute(r)) {
             final WayConnectionType wct;
-            if (!members.get(i).isRelation()) {
-                return new WayConnectionType(true);
-            } else if (i == 0) {
-                return new WayConnectionType(false);
+            if (i == 0) {
+                wct = new WayConnectionType(false);
+            } else if (!members.get(i).isRelation() || !members.get(i - 1).isRelation()) {
+                wct = new WayConnectionType(true);
             } else {
                 final List<RelationMember> previousMembers = members.get(i - 1).getRelation().getMembers();