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 ve...@apache.org on 2017/01/16 11:11:26 UTC
svn commit: r1779012 - in /axis/axis2/java/core/trunk/modules/transport:
http-hc3/src/main/java/org/apache/axis2/transport/http/impl/httpclient3/
http/src/org/apache/axis2/transport/http/
http/src/org/apache/axis2/transport/http/impl/httpclient4/
Author: veithen
Date: Mon Jan 16 11:11:26 2017
New Revision: 1779012
URL: http://svn.apache.org/viewvc?rev=1779012&view=rev
Log:
Do URL mangling in the HTTPSender base class.
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=1779012&r1=1779011&r2=1779012&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:11:26 2017
@@ -534,15 +534,13 @@ public class HTTPSenderImpl extends HTTP
* - Thrown in case an exception occurs
*/
protected void populateCommonProperties(MessageContext msgContext, URL url,
- HttpMethodBase httpMethod, HttpClient httpClient, MessageFormatter messageFormatter)
+ HttpMethodBase httpMethod, HttpClient httpClient)
throws AxisFault {
if (isAuthenticationEnabled(msgContext)) {
httpMethod.setDoAuthentication(true);
}
- url = messageFormatter.getTargetAddress(msgContext, format, url);
-
httpMethod.setPath(url.getPath());
httpMethod.setQueryString(url.getQuery());
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=1779012&r1=1779011&r2=1779012&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:11:26 2017
@@ -44,8 +44,7 @@ abstract class RequestBase<T extends Htt
this.messageFormatter = messageFormatter;
this.method = method;
httpClient = sender.getHttpClient(msgContext);
- sender.populateCommonProperties(msgContext, url, method,
- httpClient, messageFormatter);
+ sender.populateCommonProperties(msgContext, url, method, httpClient);
}
@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=1779012&r1=1779011&r2=1779012&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:11:26 2017
@@ -90,6 +90,7 @@ public abstract class HTTPSender extends
MessageFormatter messageFormatter = MessageProcessorSelector
.getMessageFormatter(msgContext);
+ url = messageFormatter.getTargetAddress(msgContext, format, url);
Request request = null;
if ((httpMethod != null)) {
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=1779012&r1=1779011&r2=1779012&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:11:26 2017
@@ -504,16 +504,13 @@ public class HTTPSenderImpl extends HTTP
*/
protected void populateCommonProperties(MessageContext msgContext, URL url,
HttpRequestBase httpMethod,
- AbstractHttpClient httpClient,
- MessageFormatter messageFormatter)
+ AbstractHttpClient httpClient)
throws AxisFault {
if (isAuthenticationEnabled(msgContext)) {
httpMethod.getParams().setBooleanParameter(ClientPNames.HANDLE_AUTHENTICATION, true);
}
- url = messageFormatter.getTargetAddress(msgContext, format, url);
-
try {
httpMethod.setURI(url.toURI());
} catch (URISyntaxException e) {
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=1779012&r1=1779011&r2=1779012&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:11:26 2017
@@ -44,8 +44,7 @@ abstract class RequestBase<T extends Htt
this.messageFormatter = messageFormatter;
this.method = method;
httpClient = sender.getHttpClient(msgContext);
- sender.populateCommonProperties(msgContext, url, method,
- httpClient, messageFormatter);
+ sender.populateCommonProperties(msgContext, url, method, httpClient);
}
@Override