Ticket #23078: josm_23078.patch

src/org/openstreetmap/josm/io/OsmApi.java

@@ -247 +247 @@
     public void initialize(ProgressMonitor monitor, boolean fastFail) throws OsmTransferCanceledException, OsmApiInitializationException {
         if (initialized)
             return;
-        cancel = false;
         try {
             CapabilitiesCache cache = new CapabilitiesCache(monitor, fastFail);
             try {
@@ -617 +616 @@
 
     private void sleepAndListen(int retry, ProgressMonitor monitor) throws OsmTransferCanceledException {
         Logging.info(tr("Waiting 10 seconds ... "));
+        if (monitor != null) {
+            monitor.addCancelListener(this::cancel);
+        }
+
         for (int i = 0; i < 10; i++) {
             if (monitor != null) {
                 monitor.setCustomText(tr("Starting retry {0} of {1} in {2} seconds ...", getMaxRetries() - retry, getMaxRetries(), 10-i));
-            }
-            if (cancel)
-                throw new OsmTransferCanceledException("Operation canceled" + (i > 0 ? " in retry #"+i : ""));
+                if (monitor.isCanceled()) {
+                    throw new OsmTransferCanceledException("Operation canceled" + (i > 0 ? " in retry #"+i : ""));
+                }
+            }
             try {
                 Thread.sleep(1000);
             } catch (InterruptedException ex) {

src/org/openstreetmap/josm/io/OsmConnection.java

@@ -48 +48 @@
 
     private static final String BASIC_AUTH = "Basic ";
 
-    protected boolean cancel;
     protected HttpClient activeConnection;
     protected OAuthParameters oauthParameters;
     protected IOAuthParameters oAuth20Parameters;
@@ -84 +83 @@
      * Cancels the connection.
      */
     public void cancel() {
-        cancel = true;
         synchronized (this) {
             if (activeConnection != null) {
                 activeConnection.disconnect();
@@ -132 +130 @@
         } catch (CredentialsAgentException e) {
             throw new OsmTransferException(e);
         }
-        if (response != null) {
-            if (response.isCanceled()) {
-                cancel = true;
-            } else {
-                String username = response.getUsername() == null ? "" : response.getUsername();
-                String password = response.getPassword() == null ? "" : String.valueOf(response.getPassword());
-                String token = username + ':' + password;
-                con.setHeader("Authorization", BASIC_AUTH + Base64.getEncoder().encodeToString(token.getBytes(StandardCharsets.UTF_8)));
-            }
+        if (response != null && !response.isCanceled()) {
+            String username = response.getUsername() == null ? "" : response.getUsername();
+            String password = response.getPassword() == null ? "" : String.valueOf(response.getPassword());
+            String token = username + ':' + password;
+            con.setHeader("Authorization", BASIC_AUTH + Base64.getEncoder().encodeToString(token.getBytes(StandardCharsets.UTF_8)));
         }
     }
 
@@ -292 +286 @@
                 throw new OsmTransferException(msg);
         }
     }
-
-    /**
-     * Replies true if this connection is canceled
-     *
-     * @return true if this connection is canceled
-     */
-    public boolean isCanceled() {
-        return cancel;
-    }
 }