Author: veithen
Date: Mon Jan 16 11:01:45 2017
New Revision: 1779009
URL: http://svn.apache.org/viewvc?rev=1779009&view=rev
Log:
Unify the code that sets the Content-Type header.
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/RequestBase.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
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/RequestBase.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=1779009&r1=1779008&r2=1779009&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
Mon Jan 16 11:01:45 2017
@@ -534,7 +534,7 @@ public class HTTPSenderImpl extends HTTP
* - Thrown in case an exception occurs
*/
protected void populateCommonProperties(MessageContext msgContext, URL url,
- HttpMethodBase httpMethod, HttpClient httpClient, String
soapActionString, MessageFormatter messageFormatter)
+ HttpMethodBase httpMethod, HttpClient httpClient, MessageFormatter
messageFormatter)
throws AxisFault {
if (isAuthenticationEnabled(msgContext)) {
@@ -547,9 +547,6 @@ public class HTTPSenderImpl extends HTTP
httpMethod.setQueryString(url.getQuery());
- httpMethod.setRequestHeader(HTTPConstants.HEADER_CONTENT_TYPE,
- messageFormatter.getContentType(msgContext, format,
soapActionString));
-
httpMethod.setRequestHeader(HTTPConstants.HEADER_HOST, url.getHost());
if (msgContext.getOptions() != null &&
msgContext.getOptions().isManageSession()) {
Modified:
axis/axis2/java/core/trunk/modules/transport/http-hc3/src/main/java/org/apache/axis2/transport/http/impl/httpclient3/RequestBase.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/RequestBase.java?rev=1779009&r1=1779008&r2=1779009&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/transport/http-hc3/src/main/java/org/apache/axis2/transport/http/impl/httpclient3/RequestBase.java
(original)
+++
axis/axis2/java/core/trunk/modules/transport/http-hc3/src/main/java/org/apache/axis2/transport/http/impl/httpclient3/RequestBase.java
Mon Jan 16 11:01:45 2017
@@ -45,7 +45,7 @@ abstract class RequestBase<T extends Htt
this.method = method;
httpClient = sender.getHttpClient(msgContext);
sender.populateCommonProperties(msgContext, url, method,
- httpClient, soapActionString, messageFormatter);
+ httpClient, messageFormatter);
}
@Override
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=1779009&r1=1779008&r2=1779009&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
Mon Jan 16 11:01:45 2017
@@ -107,6 +107,9 @@ public abstract class HTTPSender extends
request = preparePost(msgContext, url, soapActionString,
messageFormatter);
}
+ request.setHeader(HTTPConstants.HEADER_CONTENT_TYPE,
+ messageFormatter.getContentType(msgContext, format,
soapActionString));
+
String soapAction = messageFormatter.formatSOAPAction(msgContext,
format, soapActionString);
if (soapAction != null && !msgContext.isDoingREST()) {
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=1779009&r1=1779008&r2=1779009&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
Mon Jan 16 11:01:45 2017
@@ -505,7 +505,6 @@ public class HTTPSenderImpl extends HTTP
protected void populateCommonProperties(MessageContext msgContext, URL url,
HttpRequestBase
httpMethod,
AbstractHttpClient
httpClient,
- String
soapActionString,
MessageFormatter
messageFormatter)
throws AxisFault {
@@ -521,9 +520,6 @@ public class HTTPSenderImpl extends HTTP
log.error("Error in URI : " + url, e);
}
- httpMethod.setHeader(HTTPConstants.HEADER_CONTENT_TYPE,
- messageFormatter.getContentType(msgContext,
format, soapActionString));
-
httpMethod.setHeader(HTTPConstants.HEADER_HOST, url.getHost());
if (msgContext.getOptions() != null &&
msgContext.getOptions().isManageSession()) {
Modified:
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/RequestBase.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/RequestBase.java?rev=1779009&r1=1779008&r2=1779009&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/RequestBase.java
(original)
+++
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/RequestBase.java
Mon Jan 16 11:01:45 2017
@@ -45,7 +45,7 @@ abstract class RequestBase<T extends Htt
this.method = method;
httpClient = sender.getHttpClient(msgContext);
sender.populateCommonProperties(msgContext, url, method,
- httpClient, soapActionString, messageFormatter);
+ httpClient, messageFormatter);
}
@Override
