You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2012/12/14 13:54:51 UTC
svn commit: r1421835 - in
/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client:
HttpClientBuilder.java SystemDefaultHttpClient.java
Author: olegk
Date: Fri Dec 14 12:54:50 2012
New Revision: 1421835
URL: http://svn.apache.org/viewvc?rev=1421835&view=rev
Log:
Make sure 'http.keepAlive' defaults to true
Modified:
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/HttpClientBuilder.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/SystemDefaultHttpClient.java
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/HttpClientBuilder.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/HttpClientBuilder.java?rev=1421835&r1=1421834&r2=1421835&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/HttpClientBuilder.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/HttpClientBuilder.java Fri Dec 14 12:54:50 2012
@@ -459,7 +459,7 @@ public class HttpClientBuilder {
poolingmgr.setDefaultConnectionConfig(defaultConnectionConfig);
}
if (systemProperties) {
- String s = System.getProperty("http.keepAlive");
+ String s = System.getProperty("http.keepAlive", "true");
if ("true".equalsIgnoreCase(s)) {
s = System.getProperty("http.maxConnections", "5");
int max = Integer.parseInt(s);
@@ -479,7 +479,7 @@ public class HttpClientBuilder {
ConnectionReuseStrategy reuseStrategy = this.reuseStrategy;
if (reuseStrategy == null) {
if (systemProperties) {
- String s = System.getProperty("http.keepAlive");
+ String s = System.getProperty("http.keepAlive", "true");
if ("true".equalsIgnoreCase(s)) {
reuseStrategy = DefaultConnectionReuseStrategy.INSTANCE;
} else {
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/SystemDefaultHttpClient.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/SystemDefaultHttpClient.java?rev=1421835&r1=1421834&r2=1421835&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/SystemDefaultHttpClient.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/SystemDefaultHttpClient.java Fri Dec 14 12:54:50 2012
@@ -120,7 +120,7 @@ public class SystemDefaultHttpClient ext
protected ClientConnectionManager createClientConnectionManager() {
PoolingClientConnectionManager connmgr = new PoolingClientConnectionManager(
SchemeRegistryFactory.createSystemDefault());
- String s = System.getProperty("http.keepAlive");
+ String s = System.getProperty("http.keepAlive", "true");
if ("true".equalsIgnoreCase(s)) {
s = System.getProperty("http.maxConnections", "5");
int max = Integer.parseInt(s);
@@ -138,7 +138,7 @@ public class SystemDefaultHttpClient ext
@Override
protected ConnectionReuseStrategy createConnectionReuseStrategy() {
- String s = System.getProperty("http.keepAlive");
+ String s = System.getProperty("http.keepAlive", "true");
if ("true".equalsIgnoreCase(s)) {
return new DefaultConnectionReuseStrategy();
} else {