Changeset 19126 in josm for trunk

Timestamp:

2024-06-24T09:27:46+02:00 (5 months ago)

Author:

GerdP

Message:

fix #23738: Mass upload: JOSM tries to upload changes even though changeset is already closed

• while filling the changeset check if the maximum size is reached so that JOSM doesn't attempt to upload more than the maximum allowed objects
• throw ChangesetClosedException to handle the automatic close of the changeset on server side

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/io/UploadPrimitivesTask.java (modified) (1 diff)
• io/OsmServerWriter.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java

@@ -261 +261 @@
                     getProgressMonitor().subTask(
                             trn("Uploading {0} object...", "Uploading {0} objects...", toUpload.getSize(), toUpload.getSize()));
+                    getProgressMonitor().setTicks(0); // needed in 2nd and further loop executions
                     synchronized (this) {
                         writer = new OsmServerWriter();

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

@@ -6 +6 @@
 import static org.openstreetmap.josm.tools.I18n.trn;
 
+import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -19 +20 @@
 import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
+import org.openstreetmap.josm.io.ChangesetClosedException.Source;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 
@@ -156 +158 @@
             List<OsmPrimitive> chunk = new ArrayList<>(chunkSize);
             Iterator<? extends OsmPrimitive> it = primitives.iterator();
+            int maxChunkSize = api.getCapabilities().getMaxChangesetSize();
             int numChunks = (int) Math.ceil((double) primitives.size() / (double) chunkSize);
             int i = 0;
@@ -163 +166 @@
                 int j = 0;
                 chunk.clear();
-                while (it.hasNext() && j < chunkSize) {
-                    if (canceled) return;
+                while (it.hasNext() && j < chunkSize && processed.size() + j < maxChunkSize) {
                     j++;
                     chunk.add(it.next());
@@ -173 +175 @@
                                 chunk.size(), i, numChunks, chunk.size()));
                 processed.addAll(api.uploadDiff(chunk, progressMonitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false)));
+                // see #23738: server will close CS if maximum changeset size was reached
+                if (processed.size() >= maxChunkSize) {
+                    throw new ChangesetClosedException(api.getChangeset().getId(), Instant.now(), Source.UPLOAD_DATA);
+                }
             }
         } finally {