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 su...@apache.org on 2010/12/21 16:36:46 UTC
svn commit: r1051531 -
/axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java
Author: supun
Date: Tue Dec 21 15:36:45 2010
New Revision: 1051531
URL: http://svn.apache.org/viewvc?rev=1051531&view=rev
Log:
doing some minor re-factoring
Modified:
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java
Modified: axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java?rev=1051531&r1=1051530&r2=1051531&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java (original)
+++ axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java Tue Dec 21 15:36:45 2010
@@ -58,8 +58,6 @@ public class CommonsHTTPTransportSender
* {@link #init(ConfigurationContext, TransportOutDescription)}.
*/
private TransportOutDescription transportOut;
-
- int soTimeout = HTTPConstants.DEFAULT_SO_TIMEOUT;
private static final Log log = LogFactory
.getLog(CommonsHTTPTransportSender.class);
@@ -77,7 +75,9 @@ public class CommonsHTTPTransportSender
*/
private boolean defaultChunked = false;
- int connectionTimeout = HTTPConstants.DEFAULT_CONNECTION_TIMEOUT;
+ private int soTimeout = HTTPConstants.DEFAULT_SO_TIMEOUT;
+
+ private int connectionTimeout = HTTPConstants.DEFAULT_CONNECTION_TIMEOUT;
public void cleanup(MessageContext msgContext) throws AxisFault {
HttpMethod httpMethod = (HttpMethod) msgContext.getProperty(HTTPConstants.HTTP_METHOD);
@@ -168,18 +168,21 @@ public class CommonsHTTPTransportSender
format.setMimeBoundary((String) mimeBoundaryProperty);
}
- // set the timeout properteies
-
+ // set the timeout properties
Parameter soTimeoutParam = transportOut.getParameter(HTTPConstants.SO_TIMEOUT);
Parameter connTimeoutParam = transportOut.getParameter(HTTPConstants.CONNECTION_TIMEOUT);
- // set the property valuse 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()));
+ // 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 ((connTimeoutParam != null) && (msgContext.getProperty(HTTPConstants.CONNECTION_TIMEOUT) == null)) {
- msgContext.setProperty(HTTPConstants.CONNECTION_TIMEOUT, new Integer((String)connTimeoutParam.getValue()));
+ if ((connTimeoutParam != null) &&
+ (msgContext.getProperty(HTTPConstants.CONNECTION_TIMEOUT) == null)) {
+ msgContext.setProperty(HTTPConstants.CONNECTION_TIMEOUT,
+ new Integer((String) connTimeoutParam.getValue()));
}
//if a parameter has set been set, we will omit the SOAP action for SOAP 1.2
@@ -192,7 +195,9 @@ public class CommonsHTTPTransportSender
if (parameterValue != null && JavaUtils.isTrueExplicitly(parameterValue)) {
//Check whether user has already overridden this.
- Object propertyValue = msgContext.getProperty(Constants.Configuration.DISABLE_SOAP_ACTION);
+ Object propertyValue = msgContext.getProperty(
+ Constants.Configuration.DISABLE_SOAP_ACTION);
+
if (propertyValue == null || !JavaUtils.isFalseExplicitly(propertyValue)) {
msgContext.setProperty(Constants.Configuration.DISABLE_SOAP_ACTION,
Boolean.TRUE);