Author: veithen
Date: Sun Jan 22 09:42:50 2017
New Revision: 1779787
URL: http://svn.apache.org/viewvc?rev=1779787&view=rev
Log:
Make the code a bit more generic so that we can eventually unify it.
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/Request.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/RequestImpl.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=1779787&r1=1779786&r2=1779787&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 09:42:50 2017
@@ -87,7 +87,7 @@ public class HTTPSenderImpl extends HTTP
Map transportHeaders = new
CommonsTransportHeaders(request.getResponseHeaders());
msgContext.setProperty(MessageContext.TRANSPORT_HEADERS,
transportHeaders);
msgContext.setProperty(HTTPConstants.MC_HTTP_STATUS_CODE,
- new Integer(method.getStatusCode()));
+ new Integer(request.getStatusCode()));
Header header =
method.getResponseHeader(HTTPConstants.HEADER_CONTENT_TYPE);
if (header != null) {
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=1779787&r1=1779786&r2=1779787&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 09:42:50 2017
@@ -130,6 +130,16 @@ final class RequestImpl implements Reque
}
@Override
+ public int getStatusCode() {
+ return method.getStatusCode();
+ }
+
+ @Override
+ public String getStatusText() {
+ return method.getStatusText();
+ }
+
+ @Override
public Header[] getResponseHeaders() {
return convertHeaders(method.getResponseHeaders());
}
@@ -174,7 +184,7 @@ final class RequestImpl implements Reque
}
private void handleResponse() throws IOException {
- int statusCode = method.getStatusCode();
+ int statusCode = getStatusCode();
log.trace("Handling response - " + statusCode);
if (statusCode == HttpStatus.SC_ACCEPTED) {
/* When an HTTP 202 Accepted code has been received, this will be
the case of an execution
@@ -212,14 +222,14 @@ final class RequestImpl implements Reque
if
(org.apache.axis2.util.Utils.isClientThreadNonBlockingPropertySet(msgContext)) {
throw new AxisFault(Messages.getMessage("transportError",
- String.valueOf(statusCode), method.getStatusText()));
+ String.valueOf(statusCode), getStatusText()));
}
} else {
// Since we don't process the response, we must release the
// connection immediately
method.releaseConnection();
throw new AxisFault(Messages.getMessage("transportError",
String.valueOf(statusCode),
- method.getStatusText()));
+ getStatusText()));
}
}
Modified:
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/Request.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/Request.java?rev=1779787&r1=1779786&r2=1779787&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/Request.java
(original)
+++
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/Request.java
Sun Jan 22 09:42:50 2017
@@ -31,5 +31,7 @@ public interface Request {
Header[] getRequestHeaders();
void enableAuthentication(HTTPAuthenticator authenticator);
void execute() throws AxisFault;
+ int getStatusCode();
+ String getStatusText();
Header[] getResponseHeaders();
}
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=1779787&r1=1779786&r2=1779787&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 09:42:50 2017
@@ -97,7 +97,7 @@ public class HTTPSenderImpl extends HTTP
Map transportHeaders = new
CommonsTransportHeaders(request.getResponseHeaders());
msgContext.setProperty(MessageContext.TRANSPORT_HEADERS,
transportHeaders);
msgContext.setProperty(HTTPConstants.MC_HTTP_STATUS_CODE,
- new
Integer(response.getStatusLine().getStatusCode()));
+ new Integer(request.getStatusCode()));
Header header =
response.getFirstHeader(HTTPConstants.HEADER_CONTENT_TYPE);
if (header != null) {
Modified:
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/RequestImpl.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/RequestImpl.java?rev=1779787&r1=1779786&r2=1779787&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/RequestImpl.java
(original)
+++
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/RequestImpl.java
Sun Jan 22 09:42:50 2017
@@ -143,6 +143,16 @@ final class RequestImpl implements Reque
}
@Override
+ public int getStatusCode() {
+ return response.getStatusLine().getStatusCode();
+ }
+
+ @Override
+ public String getStatusText() {
+ return response.getStatusLine().getReasonPhrase();
+ }
+
+ @Override
public Header[] getResponseHeaders() {
return convertHeaders(response.getAllHeaders());
}
@@ -187,7 +197,7 @@ final class RequestImpl implements Reque
private void handleResponse() throws IOException {
boolean cleanup = true;
try {
- int statusCode = response.getStatusLine().getStatusCode();
+ int statusCode = getStatusCode();
log.trace("Handling response - " + statusCode);
boolean processResponse;
boolean fault;
@@ -203,7 +213,7 @@ final class RequestImpl implements Reque
fault = true;
} else {
throw new AxisFault(Messages.getMessage("transportError",
String.valueOf(statusCode),
-
response.getStatusLine().toString()));
+ getStatusText()));
}
sender.obtainHTTPHeaderInformation(this, response, msgContext);
if (processResponse) {
@@ -237,7 +247,7 @@ final class RequestImpl implements Reque
throw new AxisFault(Messages.
getMessage("transportError",
String.valueOf(statusCode),
-
response.getStatusLine().toString()));
+ getStatusText()));
}
}
}
