Changeset 4636 in josm for trunk/src


Ignore:
Timestamp:
2011-12-04T23:03:36+01:00 (13 years ago)
Author:
Don-vip
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/MultipolygonCache.java

    r4631 r4636  
    174174        for (Map<Relation, Multipolygon> map : maps) {
    175175            Multipolygon m = map.get(r);
    176             for (PolyData pd : m.getCombinedPolygons()) {
    177                 if (event instanceof NodeMovedEvent) {
    178                     pd.nodeMoved((NodeMovedEvent) event);
    179                 } else if (event instanceof WayNodesChangedEvent) {
    180                     pd.wayNodesChanged((WayNodesChangedEvent)event);
     176            if (m != null) {
     177                for (PolyData pd : m.getCombinedPolygons()) {
     178                    if (event instanceof NodeMovedEvent) {
     179                        pd.nodeMoved((NodeMovedEvent) event);
     180                    } else if (event instanceof WayNodesChangedEvent) {
     181                        pd.wayNodesChanged((WayNodesChangedEvent)event);
     182                    }
    181183                }
    182184            }
Note: See TracChangeset for help on using the changeset viewer.