Changeset 18433 in josm for trunk/src/org/openstreetmap

Timestamp:

2022-04-19T22:29:22+02:00 (2 years ago)

Author:

taylor.smock

Message:

Fix #22024: DataIntegrityProblemException during data upload

This is caused by a race condition between the upload methods and updates to
the relation editor. If the upload takes long enough, the user can cause an
update to the relation editor, which can trigger the problem.

This works around the problem by returning the original relation when the
dataset is locked. This keeps compatibility with the interface method javadocs.

File:

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

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

@@ -75 +75 @@
     default IRelation<?> getChangedRelation() {
         final Relation newRelation;
-        if (getEditor().getRelation() != null) {
-            newRelation = new Relation(getEditor().getRelation());
+        final Relation oldRelation = getEditor().getRelation();
+        if (oldRelation != null && oldRelation.getDataSet() != null && oldRelation.getDataSet().isLocked()) {
+            // If the dataset is locked, then we cannot change the relation. See JOSM #22024.
+            // This is due to the `setMembers` -> `addReferrer` call chain requires that the dataset is not read only.
+            return oldRelation;
+        } else if (oldRelation != null) {
+            newRelation = new Relation(oldRelation);
         } else {
             newRelation = new Relation();