Changeset 4636 in josm for trunk/src/org/openstreetmap/josm

Timestamp:

2011-12-04T23:03:36+01:00 (12 years ago)

Author:

Don-vip

Message:

see #7113 and #6987 - NPE after Split Way - Undo

File:

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

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

@@ -174 +174 @@
         for (Map<Relation, Multipolygon> map : maps) {
             Multipolygon m = map.get(r);
-            for (PolyData pd : m.getCombinedPolygons()) {
-                if (event instanceof NodeMovedEvent) {
-                    pd.nodeMoved((NodeMovedEvent) event);
-                } else if (event instanceof WayNodesChangedEvent) {
-                    pd.wayNodesChanged((WayNodesChangedEvent)event);
+            if (m != null) {
+                for (PolyData pd : m.getCombinedPolygons()) {
+                    if (event instanceof NodeMovedEvent) {
+                        pd.nodeMoved((NodeMovedEvent) event);
+                    } else if (event instanceof WayNodesChangedEvent) {
+                        pd.wayNodesChanged((WayNodesChangedEvent)event);
+                    }
                 }
             }