android/okhttp
1
0
Fork 0
mirror of https://github.com/square/okhttp.git synced 2026-01-17 08:42:25 +03:00
Code Releases Activity

Set default timeouts to ten seconds.

Browse Source 
Closes https://github.com/square/okhttp/issues/1719
This commit is contained in:
jwilson
2015-06-21 18:00:20 -04:00
parent 832038bdc2
commit 0de14e992c
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
okhttp-tests/src/test/java/com/squareup/okhttp/OkHttpClientTest.java
View File

@@ -57,6 +57,13 @@ public final class OkHttpClientTest {
Authenticator.setDefault(DEFAULT_AUTHENTICATOR);
}
@Test public void timeoutDefaults() {
OkHttpClient client = new OkHttpClient();
assertEquals(10_000, client.getConnectTimeout());
assertEquals(10_000, client.getReadTimeout());
assertEquals(10_000, client.getWriteTimeout());
}
@Test public void timeoutValidRange() {
OkHttpClient client = new OkHttpClient();
try {
@@ -89,9 +96,9 @@ public final class OkHttpClientTest {
@Test public void copyWithDefaultsWhenDefaultIsAConstant() throws Exception {
OkHttpClient client = new OkHttpClient().copyWithDefaults();
assertNull(client.internalCache());
assertEquals(0, client.getConnectTimeout());
assertEquals(0, client.getReadTimeout());
assertEquals(0, client.getWriteTimeout());
assertEquals(10_000, client.getConnectTimeout());
assertEquals(10_000, client.getReadTimeout());
assertEquals(10_000, client.getWriteTimeout());
assertTrue(client.getFollowSslRedirects());
assertNull(client.getProxy());
assertEquals(Arrays.asList(Protocol.HTTP_2, Protocol.SPDY_3, Protocol.HTTP_1_1),

6
okhttp/src/main/java/com/squareup/okhttp/OkHttpClient.java
View File

@@ -187,9 +187,9 @@ public class OkHttpClient implements Cloneable {
private boolean followSslRedirects = true;
private boolean followRedirects = true;
private boolean retryOnConnectionFailure = true;
private int connectTimeout;
private int readTimeout;
private int writeTimeout;
private int connectTimeout = 10_000;
private int readTimeout = 10_000;
private int writeTimeout = 10_000;
public OkHttpClient() {
routeDatabase = new RouteDatabase();