mirrors/public-transport-enabler
1
0
Fork 0
mirror of https://gitlab.com/oeffi/public-transport-enabler.git synced 2025-07-07 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

HttpClient: Retry request once on EOFException.

Browse source
This commit is contained in:
Andreas Schildbach 2019-01-11 17:53:17 +01:00
parent fc7596f1a2
commit f7a436c370
1 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

16
enabler/src/de/schildbach/pte/util/HttpClient.java
View file

@ -19,6 +19,7 @@ package de.schildbach.pte.util;
import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkNotNull;
import java.io.EOFException;
import java.io.IOException; import java.io.IOException;
import java.net.HttpURLConnection; import java.net.HttpURLConnection;
import java.net.Proxy; import java.net.Proxy;
@ -43,6 +44,7 @@ import javax.net.ssl.X509TrustManager;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import com.google.common.base.Throwables;
import com.google.common.primitives.Ints; import com.google.common.primitives.Ints;
import de.schildbach.pte.exception.BlockedException; import de.schildbach.pte.exception.BlockedException;
@ -137,14 +139,20 @@ public final class HttpClient {
@Override @Override
public Response intercept(final Chain chain) throws IOException { public Response intercept(final Chain chain) throws IOException {
final Request request = chain.request(); final Request request = chain.request();
final Response response = chain.proceed(request); Response response = null;
try {
response = chain.proceed(request);
} catch (final IOException x) {
if (Throwables.getRootCause(x) instanceof EOFException)
return chain.proceed(request); // retry
throw x;
}
if (response.isSuccessful() && response.peekBody(1).bytes().length == 0) { if (response.isSuccessful() && response.peekBody(1).bytes().length == 0) {
log.info("Got empty response, retrying {}", request.url()); log.info("Got empty response, retrying {}", request.url());
response.close(); response.close();
return chain.proceed(request); return chain.proceed(request); // retry
} else {
return response;
} }
return response;
} }
}; };