Changeset 3061 in josm for trunk/src

Timestamp:

2010-02-28T20:05:49+01:00 (14 years ago)

Author:

jttt

Message:

Fix #4612 delete members while relation dialog is open leads to data integrity problem

File:

• trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java

@@ -9 +9 @@
 import java.beans.PropertyChangeSupport;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
@@ -179 +180 @@
         theirVisibleState = their.isVisible();
 
-        myReferrers = my.getReferrers();
-        theirReferrers = their.getReferrers();
+        myReferrers = my.getDataSet() == null?Collections.<OsmPrimitive>emptyList():my.getReferrers();
+        theirReferrers = their.getDataSet() == null?Collections.<OsmPrimitive>emptyList():their.getReferrers();
 
         coordMergeDecision = UNDECIDED;