Changeset 18563 in josm for trunk/src

Timestamp:

2022-09-27T18:34:33+02:00 (2 years ago)

Author:

taylor.smock

Message:

Fix #22268: Upload of data triggering exception "Primitive cannot be modified in read-only dataset"

This occurs during upload, and appears to be a race condition where a dataset is
not locked when we check, but becomes locked while the relation copy constructor
is running.

This attempts to fix the problem by checking to see if any OsmDataLayer objects are
in the upload process.

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/IRelationEditorActionAccess.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/IRelationEditorActionAccess.java

@@ -6 +6 @@
 import org.openstreetmap.josm.data.osm.IRelation;
 import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.dialogs.relation.IRelationEditor;
 import org.openstreetmap.josm.gui.dialogs.relation.MemberTable;
@@ -11 +12 @@
 import org.openstreetmap.josm.gui.dialogs.relation.SelectionTable;
 import org.openstreetmap.josm.gui.dialogs.relation.SelectionTableModel;
+import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.tagging.TagEditorModel;
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingTextField;
@@ -76 +78 @@
         final Relation newRelation;
         final Relation oldRelation = getEditor().getRelation();
-        if (oldRelation != null && oldRelation.getDataSet() != null && oldRelation.getDataSet().isLocked()) {
+        boolean isUploadInProgress = MainApplication.getLayerManager().getLayersOfType(OsmDataLayer.class)
+                .stream().anyMatch(OsmDataLayer::isUploadInProgress);
+        if (isUploadInProgress || oldRelation != null && oldRelation.getDataSet() != null && oldRelation.getDataSet().isLocked()) {
             // If the dataset is locked, then we cannot change the relation. See JOSM #22024.
+            // We should also avoid changing the relation if there is an upload in progress. See JOSM #22268/#22398.
+            // There appears to be a race condition where a dataset might not be locked in the check, then is locked while using the
+            // copy relation constructor.
             // This is due to the `setMembers` -> `addReferrer` call chain requires that the dataset is not read only.
             return oldRelation;