Changeset 7643 in josm for trunk

Timestamp:

2014-10-21T21:19:16+02:00 (10 years ago)

Author:

Don-vip

Message:

avoid potential NPE

File:

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

trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java

@@ -194 +194 @@
      */
     public boolean isResolvedCompletely() {
-        return numConflicts == 0 && keysWithConflicts.isEmpty();
+        return numConflicts == 0 && keysWithConflicts != null && keysWithConflicts.isEmpty();
     }