Changeset 2591 in josm for trunk/src/org/openstreetmap/josm/io/OsmReader.java

Timestamp:

2009-12-06T20:26:21+01:00 (14 years ago)

Author:

jttt

Message:

Fix #4114 - NPE when zooming out after updating a partially downloaded relation or downloding the referrers of a node

File:

• trunk/src/org/openstreetmap/josm/io/OsmReader.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/io/OsmReader.java

@@ -418 +418 @@
         for (Long externalWayId: ways.keySet()) {
             Way w = (Way)externalIdMap.get("w" + externalWayId);
-            boolean hasIncompleteNodes = false;
             List<Node> wayNodes = new ArrayList<Node>();
             for (long id : ways.get(externalWayId)) {
@@ -438 +437 @@
                         ds.addPrimitive(n);
                     }
-                    hasIncompleteNodes = true;
                 }
                 wayNodes.add(n);
             }
             w.setNodes(wayNodes);
-            if (hasIncompleteNodes) {
+            w.setHasIncompleteNodes();
+            if (w.hasIncompleteNodes()) {
                 if (logger.isLoggable(Level.FINE)) {
                     logger.fine(tr("Marked way {0} with {1} nodes incomplete because at least one node was missing in the " +
                             "loaded data and is therefore incomplete too.", externalWayId, w.getNodesCount()));
                 }
-                w.setHasIncompleteNodes(true);
                 ds.addPrimitive(w);
             } else {
-                w.setHasIncompleteNodes(false);
                 ds.addPrimitive(w);
             }