Changeset 643 in josm for trunk/src/org/openstreetmap/josm/data/osm

Timestamp:

2008-05-19T02:20:32+02:00 (16 years ago)

Author:

framm

Message:

• fix NPE on Node.equals reported in bug #767

File:

• trunk/src/org/openstreetmap/josm/data/osm/Node.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/osm/Node.java

@@ -54 +54 @@
 
         @Override public boolean realEqual(OsmPrimitive osm, boolean semanticOnly) {
-                return osm instanceof Node ? super.realEqual(osm, semanticOnly) && coor.equals(((Node)osm).coor) : false;
+                if (osm instanceof Node) {
+            if (super.realEqual(osm, semanticOnly)) {
+                if ((coor == null) && ((Node)osm).coor == null)
+                    return true;
+                if (coor != null)
+                    return coor.equals(((Node)osm).coor);
+            }
+        }
+        return false;
     }