Changeset 13189 in josm for trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java

Timestamp:

2017-12-03T16:31:30+01:00 (6 years ago)

Author:

Don-vip

Message:

sonar - squid:S2259 - Null pointers should not be dereferenced

File:

• trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java

@@ -297 +297 @@
         Set<Node> allNodes = new HashSet<>(nodes);
         allNodes.add(targetLocationNode);
-        return mergeNodes(nodes, selectTargetNode(allNodes), targetLocationNode);
+        Node targetNode = selectTargetNode(allNodes);
+        if (targetNode == null) {
+            return null;
+        }
+        return mergeNodes(nodes, targetNode, targetLocationNode);
     }