Changeset 2131 in josm for trunk/src

Timestamp:

2009-09-14T20:32:12+02:00 (15 years ago)

Author:

Gubaer

Message:

see #3407: NPE in ConflictDialog when using OpenStreetBug plugin

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java

@@ -196 +196 @@
         };
         for (Object o : lstConflicts.getSelectedValues()) {
-            if (!conflicts.hasConflictForMy((OsmPrimitive)o)) {
+            if (conflicts == null || !conflicts.hasConflictForMy((OsmPrimitive)o)) {
                 continue;
             }
@@ -252 +252 @@
         lstConflicts.clearSelection();
         for (OsmPrimitive osm : newSelection) {
-            if (conflicts.hasConflictForMy(osm)) {
+            if (conflicts != null && conflicts.hasConflictForMy(osm)) {
                 int pos = model.indexOf(osm);
                 if (pos >= 0) {