Changeset 5824 in josm for trunk/src/org/openstreetmap/josm/command

Timestamp:

2013-04-03T22:34:42+02:00 (12 years ago)

Author:

Don-vip

Message:

fix #8567 - fix NPE when checking if incomplete nodes to delete are outside the downloaded area

File:

• trunk/src/org/openstreetmap/josm/command/Command.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/command/Command.java

@@ -16 +16 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -217 +218 @@
 
     private static boolean isOutlying(OsmPrimitive osm, Area area) {
-        if (osm instanceof Node) {
-            return !osm.isNewOrUndeleted() && !area.contains(((Node) osm).getCoor());
+        if (osm instanceof Node && !osm.isNewOrUndeleted()) {
+            LatLon coor = ((Node) osm).getCoor();
+            return coor != null && !area.contains(coor);
         } else if (osm instanceof Way) {
             for (Node n : ((Way) osm).getNodes()) {