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

Timestamp:

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

Author:

Don-vip

Message:

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

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• MergeNodesAction.java (modified) (1 diff)
• mapmode/SelectAction.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);
     }
 

trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java

@@ -719 +719 @@
                     if (ll != null && ll.isOutSideWorld()) {
                         // Revert move
-                        ((MoveCommand) c).resetToCheckpoint();
+                        if (c instanceof MoveCommand) {
+                            ((MoveCommand) c).resetToCheckpoint();
+                        }
                         // TODO: We might use a simple notification in the lower left corner.
                         JOptionPane.showMessageDialog(