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

Timestamp:

2021-03-15T13:53:05+01:00 (4 years ago)

Author:

Don-vip

Message:

fix #20594 - add robustness to AutomaticCombine when Integer values cannot be parsed

File:

• trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolutionUtil.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolutionUtil.java

@@ -298 +298 @@
         public String resolve(Set<String> values) {
             Set<String> results = instantiateSortedSet();
-            for (String value: values) {
-                String[] parts = value.split(Pattern.quote(separator), -1);
-                results.addAll(Arrays.asList(parts));
+            String pattern = Pattern.quote(separator);
+            try {
+                for (String value: values) {
+                    results.addAll(Arrays.asList(value.split(pattern, -1)));
+                }
+            } catch (NumberFormatException e) {
+                Logging.error("Unable to parse {0} values in {1} -> {2}", sort, this, e.getMessage());
+                Logging.debug(e);
+                results = values;
             }
             return String.join(separator, results);