You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2010/09/05 21:43:20 UTC
svn commit: r992880 -
/axis/axis2/java/core/branches/1_5/modules/transport/http/src/org/apache/axis2/transport/http/AbstractHTTPSender.java
Author: veithen
Date: Sun Sep 5 19:43:20 2010
New Revision: 992880
URL: http://svn.apache.org/viewvc?rev=992880&view=rev
Log:
Applying final fix for AXIS2-4751:
* Reverted r963711 (Jarek's second change for AXIS2-4751 on the 1.5 branch).
* Reapplied r958718 (Jarek's original change), i.e. reverted r960335.
The apparent regression caused by Jarek's original change was actually an issue in Rampart's STSClient, namely a missing call to ServiceClient#cleanupTransport; see r992868).
The trunk and the 1.5 branch are now in sync with respect to the CLOSE_WAIT issue and AXIS2-4751.
Modified:
axis/axis2/java/core/branches/1_5/modules/transport/http/src/org/apache/axis2/transport/http/AbstractHTTPSender.java
Modified: axis/axis2/java/core/branches/1_5/modules/transport/http/src/org/apache/axis2/transport/http/AbstractHTTPSender.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_5/modules/transport/http/src/org/apache/axis2/transport/http/AbstractHTTPSender.java?rev=992880&r1=992879&r2=992880&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_5/modules/transport/http/src/org/apache/axis2/transport/http/AbstractHTTPSender.java (original)
+++ axis/axis2/java/core/branches/1_5/modules/transport/http/src/org/apache/axis2/transport/http/AbstractHTTPSender.java Sun Sep 5 19:43:20 2010
@@ -41,7 +41,8 @@ import org.apache.commons.httpclient.Htt
import org.apache.commons.httpclient.HttpConnectionManager;
import org.apache.commons.httpclient.HttpMethod;
import org.apache.commons.httpclient.HttpMethodBase;
-import org.apache.commons.httpclient.HttpVersion;import org.apache.commons.httpclient.MultiThreadedHttpConnectionManager;
+import org.apache.commons.httpclient.HttpVersion;
+import org.apache.commons.httpclient.MultiThreadedHttpConnectionManager;
import org.apache.commons.httpclient.NTCredentials;
import org.apache.commons.httpclient.NameValuePair;
import org.apache.commons.httpclient.UsernamePasswordCredentials;
@@ -504,12 +505,8 @@ public abstract class AbstractHTTPSender
if (connManager == null) {
log.trace("Making new ConnectionManager");
connManager = new MultiThreadedHttpConnectionManager();
- /*
- * Commented out for now as bugs in other parts of Axis2 cause test failures when
- * proper connection reuse is enabled.
- */
- // configContext.setProperty(HTTPConstants.MULTITHREAD_HTTP_CONNECTION_MANAGER,
- // connManager);
+ configContext.setProperty(HTTPConstants.MULTITHREAD_HTTP_CONNECTION_MANAGER,
+ connManager);
}
}
}