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

Timestamp:

2022-12-05T14:37:26+01:00 (2 years ago)

Author:

taylor.smock

Message:

See #21829: DataIntegrityProblemException: Primitive must be part of the dataset

This ensures we fail earlier -- validateAsync is called later from the EDT,
which means we cannot figure out where the data came from.

File:

• trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPreset.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPreset.java

@@ -445 +445 @@
         }
 
-        if (selected.size() == 1 && USE_VALIDATOR.get()) {
+        if (selected.size() == 1 && Boolean.TRUE.equals(USE_VALIDATOR.get())) {
+            // Fail early -- validateAsync requires the primitive(s) to be part of a dataset. Failing later in validateAsync ''does not'' give us
+            // a usable stack trace. See #21829 for details.
+            selected.forEach(OsmPrimitive::checkDataset);
             itemGuiSupport.addListener((source, key, newValue) ->
                     TaggingPresetValidation.validateAsync(selected.iterator().next(), validationLabel, getChangedTags()));