Changeset 19135 in josm for trunk

Timestamp:

2024-07-10T09:28:34+02:00 (5 months ago)

Author:

GerdP

Message:

fix #23754: JOSM fails to upload exactly 30000 changes in chunks of 10000

• don't compare collection sizes() because they are changed in different situations

File:

• trunk/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java (modified) (5 diffs)

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

@@ -51 +51 @@
     private boolean uploadCanceled;
     private Exception lastException;
+    /** The objects to upload. Successfully uploaded objects are removed. */
     private final APIDataSet toUpload;
     private OsmServerWriter writer;
@@ -57 +58 @@
     private final Set<IPrimitive> processedPrimitives;
     private final UploadStrategySpecification strategy;
+    /** Initial number of objects to be uploaded */
+    private final int numObjectsToUpload;
 
     /**
@@ -77 +80 @@
         ensureParameterNotNull(changeset, "changeset");
         this.toUpload = toUpload;
+        this.numObjectsToUpload = toUpload.getSize();
         this.layer = layer;
         this.changeset = changeset;
@@ -109 +113 @@
                 )
         };
-        int numObjectsToUploadLeft = toUpload.getSize() - processedPrimitives.size();
+        int numObjectsToUploadLeft = numObjectsToUpload - processedPrimitives.size();
         String msg1 = tr("The server reported that the current changeset was closed.<br>"
                 + "This is most likely because the changesets size exceeded the max. size<br>"
@@ -161 +165 @@
      */
     protected boolean handleChangesetFullResponse() throws OsmTransferException {
-        if (processedPrimitives.size() == toUpload.getSize()) {
+        if (processedPrimitives.size() >= numObjectsToUpload) {
             strategy.setPolicy(MaxChangesetSizeExceededPolicy.ABORT);
             return false;