Changeset 15233 in josm for trunk

Timestamp:

2019-07-08T00:33:39+02:00 (5 years ago)

Author:

Don-vip

Message:

see #17861 - last bugfixes

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/progress/NullProgressMonitor.java (modified) (1 diff)
• src/org/openstreetmap/josm/tools/HttpClient.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/JOSMFixture.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/progress/NullProgressMonitor.java

@@ -57 +57 @@
     @Override
     public void indeterminateSubTask(String title) {
-        Logging.debug(title);
+        if (title != null)
+            Logging.debug(title);
     }
 

trunk/src/org/openstreetmap/josm/tools/HttpClient.java

@@ -176 +176 @@
                     maxRedirects--;
                     Logging.info(tr("Download redirected to ''{0}''", redirectLocation));
-                    return connect();
+                    response = connect();
+                    successfulConnection = true;
+                    return response;
                 } else if (maxRedirects == 0) {
                     String msg = tr("Too many redirects to the download URL detected. Aborting.");
@@ -534 +536 @@
      */
     public final byte[] getRequestBody() {
-        return requestBody;
+        return Utils.copyArray(requestBody);
     }
 

trunk/test/unit/org/openstreetmap/josm/JOSMFixture.java

@@ -31 +31 @@
 import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
+import org.openstreetmap.josm.tools.Http1Client;
+import org.openstreetmap.josm.tools.HttpClient;
 import org.openstreetmap.josm.tools.I18n;
 import org.openstreetmap.josm.tools.JosmRuntimeException;
@@ -109 +111 @@
         Config.setBaseDirectoriesProvider(JosmBaseDirectories.getInstance());
         Config.setUrlsProvider(JosmUrls.getInstance());
+        HttpClient.setFactory(Http1Client::new);
         pref.resetToInitialState();
         pref.enableSaveOnPut(false);