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

Timestamp:

2019-09-17T09:15:17+02:00 (6 years ago)

Author:

GerdP

Message:

fix #18137: NPE in UnconnectedWays

File:

• trunk/src/org/openstreetmap/josm/data/validation/tests/UnconnectedWays.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/data/validation/tests/UnconnectedWays.java

@@ -53 +53 @@
 
     protected abstract boolean isCandidate(OsmPrimitive p);
+
+    protected boolean isWantedWay(Way w) {
+        return w.isUsable() && isCandidate(w);
+    }
 
     /**
@@ -320 +324 @@
     private Way getWantedParentWay(Node endnode) {
         for (Way w : endnode.getParentWays()) {
-            if (isCandidate(w))
+            if (isWantedWay(w))
                 return w;
         }
@@ -360 +364 @@
 
         for (Way w : ds.getWays()) {
-            if (w.isUsable() && isCandidate(w) && w.getRealNodesCount() > 1) {
+            if (isWantedWay(w) && w.getRealNodesCount() > 1) {
                 waySegments.addAll(getWaySegments(w));
                 addNode(w.firstNode(), endnodes);
@@ -445 +449 @@
                 visited.add(node);
                 for (final Way way : node.getParentWays()) {
-                    if (isCandidate(way)) {
+                    if (isWantedWay(way)) {
                         List<Node> nextNodes = new ArrayList<>();
                         int pos = way.getNodes().indexOf(node);