Author: veithen
Date: Sun Jan 22 20:04:04 2017
New Revision: 1779855
URL: http://svn.apache.org/viewvc?rev=1779855&view=rev
Log:
Some cleanup.
Modified:
axis/axis2/java/core/trunk/modules/transport/http-hc3/src/main/java/org/apache/axis2/transport/http/impl/httpclient3/HTTPSenderImpl.java
axis/axis2/java/core/trunk/modules/transport/http-hc3/src/main/java/org/apache/axis2/transport/http/impl/httpclient3/RequestImpl.java
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/HTTPSender.java
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/HTTPSenderImpl.java
Modified:
axis/axis2/java/core/trunk/modules/transport/http-hc3/src/main/java/org/apache/axis2/transport/http/impl/httpclient3/HTTPSenderImpl.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/http-hc3/src/main/java/org/apache/axis2/transport/http/impl/httpclient3/HTTPSenderImpl.java?rev=1779855&r1=1779854&r2=1779855&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/transport/http-hc3/src/main/java/org/apache/axis2/transport/http/impl/httpclient3/HTTPSenderImpl.java
(original)
+++
axis/axis2/java/core/trunk/modules/transport/http-hc3/src/main/java/org/apache/axis2/transport/http/impl/httpclient3/HTTPSenderImpl.java
Sun Jan 22 20:04:04 2017
@@ -46,14 +46,6 @@ public class HTTPSenderImpl extends HTTP
private static final Log log = LogFactory.getLog(HTTPSenderImpl.class);
- boolean isChunked() {
- return chunked;
- }
-
- String getHttpVersion() {
- return httpVersion;
- }
-
@Override
protected Request createRequest(MessageContext msgContext, String
methodName, URL url,
AxisRequestEntity requestEntity) throws AxisFault {
Modified:
axis/axis2/java/core/trunk/modules/transport/http-hc3/src/main/java/org/apache/axis2/transport/http/impl/httpclient3/RequestImpl.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/http-hc3/src/main/java/org/apache/axis2/transport/http/impl/httpclient3/RequestImpl.java?rev=1779855&r1=1779854&r2=1779855&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/transport/http-hc3/src/main/java/org/apache/axis2/transport/http/impl/httpclient3/RequestImpl.java
(original)
+++
axis/axis2/java/core/trunk/modules/transport/http-hc3/src/main/java/org/apache/axis2/transport/http/impl/httpclient3/RequestImpl.java
Sun Jan 22 20:04:04 2017
@@ -91,9 +91,7 @@ final class RequestImpl implements Reque
}
};
entityEnclosingMethod.setRequestEntity(new
AxisRequestEntityImpl(requestEntity));
- if
(!sender.getHttpVersion().equals(HTTPConstants.HEADER_PROTOCOL_10) &&
sender.isChunked()) {
- entityEnclosingMethod.setContentChunked(true);
- }
+ entityEnclosingMethod.setContentChunked(requestEntity.isChunked());
method = entityEnclosingMethod;
}
method.setPath(url.getPath());
Modified:
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/HTTPSender.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/HTTPSender.java?rev=1779855&r1=1779854&r2=1779855&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/HTTPSender.java
(original)
+++
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/HTTPSender.java
Sun Jan 22 20:04:04 2017
@@ -56,8 +56,8 @@ public abstract class HTTPSender {
private static final Log log = LogFactory.getLog(HTTPSender.class);
- protected boolean chunked = false;
- protected String httpVersion = HTTPConstants.HEADER_PROTOCOL_11;
+ private boolean chunked = false;
+ private String httpVersion = HTTPConstants.HEADER_PROTOCOL_11;
protected TransportOutDescription proxyOutSetting = null;
protected OMOutputFormat format = new OMOutputFormat();
Modified:
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/HTTPSenderImpl.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/HTTPSenderImpl.java?rev=1779855&r1=1779854&r2=1779855&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/HTTPSenderImpl.java
(original)
+++
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/HTTPSenderImpl.java
Sun Jan 22 20:04:04 2017
@@ -39,7 +39,6 @@ import org.apache.http.conn.ssl.SSLSocke
import org.apache.http.impl.client.AbstractHttpClient;
import org.apache.http.impl.client.DefaultHttpClient;
import org.apache.http.impl.conn.PoolingClientConnectionManager;
-import org.apache.http.message.BasicHeader;
import org.apache.http.params.BasicHttpParams;
import org.apache.http.params.CoreConnectionPNames;
import org.apache.http.params.CoreProtocolPNames;
@@ -51,14 +50,6 @@ public class HTTPSenderImpl extends HTTP
private static final Log log = LogFactory.getLog(HTTPSenderImpl.class);
- boolean isChunked() {
- return chunked;
- }
-
- String getHttpVersion() {
- return httpVersion;
- }
-
@Override
protected Request createRequest(MessageContext msgContext, String
methodName, URL url,
AxisRequestEntity requestEntity) throws AxisFault {