Changeset 4683 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

21.12.2011 12:49:58 (5 months ago)

Author:

Don-vip

Message:

fix #7173 - Unexpected Exception when purging a way in a Multipolygon

File:

• trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/Multipolygon.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/Multipolygon.java

@@ -295 +295 @@
                     List<Way> waysToJoin = new ArrayList<Way>();
                     for (Iterator<Long> it = wayIds.iterator(); it.hasNext(); ) {
-                        waysToJoin.add((Way) ds.getPrimitiveById(it.next(), OsmPrimitiveType.WAY));
+                        Way w = (Way) ds.getPrimitiveById(it.next(), OsmPrimitiveType.WAY);
+                        if (w != null && w.getNodesCount() > 0) { // fix #7173 (empty ways on purge)
+                            waysToJoin.add(w);
+                        }
                     }
                     nodes.addAll(joinWays(waysToJoin).iterator().next().getNodes());