Changeset 16812 in josm for trunk

Timestamp:

2020-07-30T12:44:04+02:00 (4 years ago)

Author:

GerdP

Message:

fix #19598: DataIntegrityProblemException: Primitive cannot be modified in read-only dataset

• avoids to modify the original object as this requires a writeLock and probably causes trouble with locked files
• avoids to call the rather complex filterDeprecatedTags() method by checking LEVENSHTEIN_DISTANCE first

File:

• trunk/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java

@@ -39 +39 @@
 import org.openstreetmap.josm.command.SequenceCommand;
 import org.openstreetmap.josm.data.osm.AbstractPrimitive;
+import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.OsmUtils;
@@ -45 +46 @@
 import org.openstreetmap.josm.data.osm.TagMap;
 import org.openstreetmap.josm.data.osm.Tagged;
+import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.preferences.sources.ValidatorPrefHelper;
 import org.openstreetmap.josm.data.validation.OsmValidator;
@@ -922 +924 @@
                 }
             }
-            filterDeprecatedTags(p, key, fixVals);
             if (minDist <= MAX_LEVENSHTEIN_DISTANCE && maxPresetValueLen > MAX_LEVENSHTEIN_DISTANCE
                     && !fixVals.isEmpty()
                     && (harmonizedValue.length() > 3 || minDist < MAX_LEVENSHTEIN_DISTANCE)) {
-                if (fixVals.size() < 2) {
-                    fixedValue = fixVals.get(0);
-                } else {
-                    Collections.sort(fixVals);
-                    // misspelled preset value with multiple good alternatives
-                    errors.add(TestError.builder(this, Severity.WARNING, MISSPELLED_VALUE_NO_FIX)
-                            .message(tr("Unknown property value"),
-                                    marktr("Value ''{0}'' for key ''{1}'' is unknown, maybe one of {2} is meant?"),
-                                    value, key, fixVals)
-                            .primitives(p).build());
-                    withErrors.put(p, "WPV");
-                    return;
+                filterDeprecatedTags(p, key, fixVals);
+                if (!fixVals.isEmpty()) {
+                    if (fixVals.size() < 2) {
+                        fixedValue = fixVals.get(0);
+                    } else {
+                        Collections.sort(fixVals);
+                        // misspelled preset value with multiple good alternatives
+                        errors.add(TestError.builder(this, Severity.WARNING, MISSPELLED_VALUE_NO_FIX)
+                                .message(tr("Unknown property value"),
+                                        marktr("Value ''{0}'' for key ''{1}'' is unknown, maybe one of {2} is meant?"),
+                                        value, key, fixVals)
+                                .primitives(p).build());
+                        withErrors.put(p, "WPV");
+                        return;
+                    }
                 }
             }
@@ -966 +970 @@
             return;
 
-        String origVal = p.get(key);
-        try {
-            int unchangedDeprecated = countDeprecated(p);
-            Iterator<String> iter = fixVals.iterator();
-            while (iter.hasNext()) {
-                p.put(key, iter.next());
-                if (countDeprecated(p) > unchangedDeprecated)
-                    iter.remove();
-            }
-        } finally {
-            // restore original value
-            p.put(key, origVal);
+        int unchangedDeprecated = countDeprecated(p);
+        Iterator<String> iter = fixVals.iterator();
+        OsmPrimitive clone;
+        if (p instanceof Node) {
+            clone = new Node((Node) p);
+        } else if (p instanceof Way) {
+            clone = new Way((Way) p);
+        } else if (p instanceof Relation) {
+            clone = new Relation((Relation) p);
+        } else {
+            return; // should not happen
+        }
+        while (iter.hasNext()) {
+            clone.put(key, iter.next());
+            if (countDeprecated(clone) > unchangedDeprecated)
+                iter.remove();
         }
     }