[maven-scm] copy for tag v1.5.2
diff --git a/modules/transport/http/src/org/apache/axis2/transport/http/AbstractHTTPSender.java b/modules/transport/http/src/org/apache/axis2/transport/http/AbstractHTTPSender.java
index e76ecd9..4412618 100644
--- a/modules/transport/http/src/org/apache/axis2/transport/http/AbstractHTTPSender.java
+++ b/modules/transport/http/src/org/apache/axis2/transport/http/AbstractHTTPSender.java
@@ -41,7 +41,8 @@
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 @@
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);
}
}
}
diff --git a/release-notes.html b/release-notes.html
index 875efa6..24034d8 100644
--- a/release-notes.html
+++ b/release-notes.html
@@ -40,6 +40,7 @@
<li>[AXIS2-4113] Unable to sign axis2 jar 1.4/1.4.1: ZipException</li>
<li>[AXIS2-4371] Unable to compile class for JSP: axis2-web/viewphases.jsp</li>
<li>[AXIS2-4450] CVE-2010-1632: Message builders for SOAP and XML should not attempt to load DTDs</li>
+ <li>[AXIS2-4751] Cookie value is always kept whatever SESSION_MAINTAIN_PROPERTY value is configured</li>
<li>[AXIS2-4752] Timeout due to connection pool is starved in latest 1.5.2-SNAPSHOT code.</li>
<li>[AXIS2-4768] Mtom optimization doesn't work when using simple bean</li>
<li>[AXIS2-4787] Hardcoded Bundle-Versions in adb, jaxws, kernel, metadata and saaj modules</li>
