Changeset 15233 in josm


Ignore:
Timestamp:
2019-07-08T00:33:39+02:00 (7 weeks ago)
Author:
Don-vip
Message:

see #17861 - last bugfixes

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/gui/progress/NullProgressMonitor.java

    r14153 r15233  
    5757    @Override
    5858    public void indeterminateSubTask(String title) {
    59         Logging.debug(title);
     59        if (title != null)
     60            Logging.debug(title);
    6061    }
    6162
  • trunk/src/org/openstreetmap/josm/tools/HttpClient.java

    r15229 r15233  
    176176                    maxRedirects--;
    177177                    Logging.info(tr("Download redirected to ''{0}''", redirectLocation));
    178                     return connect();
     178                    response = connect();
     179                    successfulConnection = true;
     180                    return response;
    179181                } else if (maxRedirects == 0) {
    180182                    String msg = tr("Too many redirects to the download URL detected. Aborting.");
     
    534536     */
    535537    public final byte[] getRequestBody() {
    536         return requestBody;
     538        return Utils.copyArray(requestBody);
    537539    }
    538540
  • trunk/test/unit/org/openstreetmap/josm/JOSMFixture.java

    r14253 r15233  
    3131import org.openstreetmap.josm.spi.preferences.Config;
    3232import org.openstreetmap.josm.testutils.JOSMTestRules;
     33import org.openstreetmap.josm.tools.Http1Client;
     34import org.openstreetmap.josm.tools.HttpClient;
    3335import org.openstreetmap.josm.tools.I18n;
    3436import org.openstreetmap.josm.tools.JosmRuntimeException;
     
    109111        Config.setBaseDirectoriesProvider(JosmBaseDirectories.getInstance());
    110112        Config.setUrlsProvider(JosmUrls.getInstance());
     113        HttpClient.setFactory(Http1Client::new);
    111114        pref.resetToInitialState();
    112115        pref.enableSaveOnPut(false);
Note: See TracChangeset for help on using the changeset viewer.