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

Timestamp:

2013-09-04T00:37:59+02:00 (12 years ago)

Author:

Don-vip

Message:

fix #9042 - Robustness to invalid .osm files containing null coordinates

File:

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

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

@@ -151 +151 @@
         for (Node n : nodes) {
             OldNodeState os = it.next();
-            n.setEastNorth(os.eastNorth.add(x, y));
+            if (os.eastNorth != null) {
+                n.setEastNorth(os.eastNorth.add(x, y));
+            }
         }
     }
@@ -160 +162 @@
             if (n == null)
                 throw new AssertionError("null detected in node list");
-            if (n.getEastNorth() == null)
-                throw new AssertionError("null coordinates detected in node list");
-
-            n.setEastNorth(n.getEastNorth().add(x, y));
-            n.setModified(true);
+            EastNorth en = n.getEastNorth();
+            if (en != null) {
+                n.setEastNorth(en.add(x, y));
+                n.setModified(true);
+            }
         }
         return true;