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

Timestamp:

2016-08-13T17:26:03+02:00 (8 years ago)

Author:

Don-vip

Message:

fix #13322 - NPE

File:

• trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java (modified) (2 diffs)

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

@@ -14 +14 @@
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Objects;
 import java.util.Set;
 
@@ -332 +333 @@
             if (!targetNode.equals(targetLocationNode)) {
                 LatLon targetLocationCoor = targetLocationNode.getCoor();
-                if (!targetNode.getCoor().equals(targetLocationCoor)) {
+                if (!Objects.equals(targetNode.getCoor(), targetLocationCoor)) {
                     Node newTargetNode = new Node(targetNode);
                     newTargetNode.setCoor(targetLocationCoor);