Changeset 15783 in josm for trunk/src

Timestamp:

2020-01-26T23:49:41+01:00 (5 years ago)

Author:

Don-vip

Message:

see #18601 - Add synchronzation to ensure that the AbstractPrimitive current unique id is not incremented backwards accidentally (patch by taylor.smock)

File:

• trunk/src/org/openstreetmap/josm/io/AbstractReader.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/io/AbstractReader.java

@@ -327 +327 @@
         } finally {
             OptionalLong minId = externalIdMap.values().stream().mapToLong(AbstractPrimitive::getUniqueId).min();
-            if (minId.isPresent() && minId.getAsLong() < AbstractPrimitive.currentUniqueId()) {
-                AbstractPrimitive.advanceUniqueId(minId.getAsLong());
+            synchronized (AbstractPrimitive.class) {
+                if (minId.isPresent() && minId.getAsLong() < AbstractPrimitive.currentUniqueId()) {
+                    AbstractPrimitive.advanceUniqueId(minId.getAsLong());
+                }
             }
             progressMonitor.finishTask();