Changeset 14710 in josm


Ignore:
Timestamp:
2019-01-20T19:15:11+01:00 (4 weeks ago)
Author:
Don-vip
Message:

fix #17207 - NPE

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/gui/conflict/pair/AbstractListMergeModel.java

    r14153 r14710  
    399399            T entry = source.get(row);
    400400            OsmPrimitive primitive = getMyPrimitive(entry);
    401             if (!primitive.isDeleted()) {
    402                 T clone = cloneEntryForMergedList(entry);
    403                 newItems.add(clone);
    404             } else {
    405                 deletedIds.add(primitive.getPrimitiveId());
     401            if (primitive != null) {
     402                if (!primitive.isDeleted()) {
     403                    T clone = cloneEntryForMergedList(entry);
     404                    newItems.add(clone);
     405                } else {
     406                    deletedIds.add(primitive.getPrimitiveId());
     407                }
    406408            }
    407409        }
Note: See TracChangeset for help on using the changeset viewer.