File tree Expand file tree Collapse file tree 2 files changed +15
-16
lines changed
google-http-client-apache-v2/src/main/java/com/google/api/client/http/apache/v2 Expand file tree Collapse file tree 2 files changed +15
-16
lines changed Original file line number Diff line number Diff line change @@ -33,11 +33,15 @@ final class ApacheHttpRequest extends LowLevelHttpRequest {
3333
3434 private RequestConfig .Builder requestConfig ;
3535
36+ @ SuppressWarnings ("deprecation" )
3637 ApacheHttpRequest (HttpClient httpClient , HttpRequestBase request ) {
3738 this .httpClient = httpClient ;
3839 this .request = request ;
3940 // disable redirects as google-http-client handles redirects
40- this .requestConfig = RequestConfig .custom ().setRedirectsEnabled (false );
41+ this .requestConfig = RequestConfig .custom ()
42+ .setRedirectsEnabled (false )
43+ // TODO(chingor): configure in HttpClientBuilder when available
44+ .setStaleConnectionCheckEnabled (false );
4145 }
4246
4347 @ Override
Original file line number Diff line number Diff line change @@ -130,22 +130,17 @@ public static HttpClient newDefaultHttpClient() {
130130 .setSndBufSize (8192 )
131131 .build ();
132132
133- PoolingHttpClientConnectionManager connectionManager =
134- new PoolingHttpClientConnectionManager (-1 , TimeUnit .MILLISECONDS );
135- // Disable the stale connection check (previously configured in the HttpConnectionParams
136- connectionManager .setValidateAfterInactivity (-1 );
137-
138133 return HttpClientBuilder .create ()
139- .useSystemProperties ()
140- .setSSLSocketFactory (SSLConnectionSocketFactory .getSocketFactory ())
141- .setDefaultSocketConfig (socketConfig )
142- .setMaxConnTotal (200 )
143- .setMaxConnPerRoute (20 )
144- . setRoutePlanner ( new SystemDefaultRoutePlanner ( ProxySelector . getDefault ()) )
145- . setConnectionManager ( connectionManager )
146- .disableRedirectHandling ()
147- .disableAutomaticRetries ()
148- .build ();
134+ .useSystemProperties ()
135+ .setSSLSocketFactory (SSLConnectionSocketFactory .getSocketFactory ())
136+ .setDefaultSocketConfig (socketConfig )
137+ .setMaxConnTotal (200 )
138+ .setMaxConnPerRoute (20 )
139+ . setConnectionTimeToLive (- 1 , TimeUnit . MILLISECONDS )
140+ . setRoutePlanner ( new SystemDefaultRoutePlanner ( ProxySelector . getDefault ()) )
141+ .disableRedirectHandling ()
142+ .disableAutomaticRetries ()
143+ .build ();
149144 }
150145
151146 @ Override
You can’t perform that action at this time.
0 commit comments