Author: sagara
Date: Wed Jun 27 12:03:08 2012
New Revision: 1354453
URL: http://svn.apache.org/viewvc?rev=1354453&view=rev
Log:
AXIS2-3818- Merged r1354438 to 1.6 branch.
Modified:
axis/axis2/java/core/branches/1_6/ (props changed)
axis/axis2/java/core/branches/1_6/modules/transport/http/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java
Propchange: axis/axis2/java/core/branches/1_6/
------------------------------------------------------------------------------
Merged /axis/axis2/java/core/trunk:r1354438
Modified:
axis/axis2/java/core/branches/1_6/modules/transport/http/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/transport/http/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java?rev=1354453&r1=1354452&r2=1354453&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_6/modules/transport/http/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java
(original)
+++
axis/axis2/java/core/branches/1_6/modules/transport/http/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java
Wed Jun 27 12:03:08 2012
@@ -168,21 +168,13 @@ public class CommonsHTTPTransportSender
format.setMimeBoundary((String) mimeBoundaryProperty);
}
- // set the timeout properties
- Parameter soTimeoutParam =
transportOut.getParameter(HTTPConstants.SO_TIMEOUT);
- Parameter connTimeoutParam =
transportOut.getParameter(HTTPConstants.CONNECTION_TIMEOUT);
-
// set the property values only if they are not set by the user
explicitly
- if ((soTimeoutParam != null) &&
- (msgContext.getProperty(HTTPConstants.SO_TIMEOUT) ==
null)) {
- msgContext.setProperty(HTTPConstants.SO_TIMEOUT,
- new Integer((String) soTimeoutParam.getValue()));
+ if (msgContext.getProperty(HTTPConstants.SO_TIMEOUT) == null) {
+ msgContext.setProperty(HTTPConstants.SO_TIMEOUT, soTimeout);
}
- if ((connTimeoutParam != null) &&
- (msgContext.getProperty(HTTPConstants.CONNECTION_TIMEOUT)
== null)) {
- msgContext.setProperty(HTTPConstants.CONNECTION_TIMEOUT,
- new Integer((String) connTimeoutParam.getValue()));
+ if (msgContext.getProperty(HTTPConstants.CONNECTION_TIMEOUT) ==
null) {
+ msgContext.setProperty(HTTPConstants.CONNECTION_TIMEOUT,
connectionTimeout);
}
//if a parameter has set been set, we will omit the SOAP action
for SOAP 1.2
