Changeset 14710 in josm for trunk/src

Timestamp:

2019-01-20T19:15:11+01:00 (6 years ago)

Author:

Don-vip

Message:

fix #17207 - NPE

File:

• trunk/src/org/openstreetmap/josm/gui/conflict/pair/AbstractListMergeModel.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/conflict/pair/AbstractListMergeModel.java

@@ -399 +399 @@
             T entry = source.get(row);
             OsmPrimitive primitive = getMyPrimitive(entry);
-            if (!primitive.isDeleted()) {
-                T clone = cloneEntryForMergedList(entry);
-                newItems.add(clone);
-            } else {
-                deletedIds.add(primitive.getPrimitiveId());
+            if (primitive != null) {
+                if (!primitive.isDeleted()) {
+                    T clone = cloneEntryForMergedList(entry);
+                    newItems.add(clone);
+                } else {
+                    deletedIds.add(primitive.getPrimitiveId());
+                }
             }
         }