Merge pull request #156 from apache/dependabot/maven/com.github.veithen.maven-wsimport-maven-plugin-0.2.2
Bump wsimport-maven-plugin from 0.2.1 to 0.2.2
diff --git a/modules/kernel/src/org/apache/axis2/engine/DispatchPhase.java b/modules/kernel/src/org/apache/axis2/engine/DispatchPhase.java
index f096883..148470c 100644
--- a/modules/kernel/src/org/apache/axis2/engine/DispatchPhase.java
+++ b/modules/kernel/src/org/apache/axis2/engine/DispatchPhase.java
@@ -45,6 +45,7 @@
import org.apache.commons.logging.LogFactory;
import javax.xml.namespace.QName;
+import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -67,7 +68,7 @@
Boolean disableAck = (Boolean) msgContext.getProperty(Constants.Configuration.DISABLE_RESPONSE_ACK);
if(disableAck == null) {
disableAck = (Boolean) (msgContext.getAxisService() != null ? msgContext.getAxisService().getParameterValue(Constants.Configuration.DISABLE_RESPONSE_ACK) : null);
- }
+ }
return disableAck;
}
@@ -79,6 +80,8 @@
AxisFault fault = new AxisFault(Messages.getMessage("servicenotfoundforepr",
((toEPR != null) ? toEPR.getAddress() : "")));
fault.setFaultCode(org.apache.axis2.namespace.Constants.FAULT_CLIENT);
+ Integer not_found = HttpServletResponse.SC_NOT_FOUND;
+ msgContext.setProperty(Constants.HTTP_RESPONSE_STATE, not_found.toString());
throw fault;
}
@@ -403,4 +406,4 @@
|| mepString.equals(WSDL2Constants.MEP_URI_IN_ONLY));
}
-}
\ No newline at end of file
+}
diff --git a/modules/transport/http/src/org/apache/axis2/transport/http/AxisServlet.java b/modules/transport/http/src/org/apache/axis2/transport/http/AxisServlet.java
index 1d8eed9..c33db35 100644
--- a/modules/transport/http/src/org/apache/axis2/transport/http/AxisServlet.java
+++ b/modules/transport/http/src/org/apache/axis2/transport/http/AxisServlet.java
@@ -392,9 +392,12 @@
String status =
(String) msgContext.getProperty(Constants.HTTP_RESPONSE_STATE);
if (status == null) {
+ log.error("processAxisFault() found a null HTTP status from the MessageContext instance, setting HttpServletResponse status to: " + Constants.HTTP_RESPONSE_STATE);
res.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
} else {
+ log.error("processAxisFault() found an HTTP status from the MessageContext instance, setting HttpServletResponse status to: " + status);
res.setStatus(Integer.parseInt(status));
+ return;
}
AxisBindingOperation axisBindingOperation =
diff --git a/modules/transport/http/src/org/apache/axis2/transport/http/HTTPSender.java b/modules/transport/http/src/org/apache/axis2/transport/http/HTTPSender.java
index 0465705..04c7443 100644
--- a/modules/transport/http/src/org/apache/axis2/transport/http/HTTPSender.java
+++ b/modules/transport/http/src/org/apache/axis2/transport/http/HTTPSender.java
@@ -204,7 +204,7 @@
processResponse = true;
fault = false;
} else if (statusCode == HttpStatus.SC_INTERNAL_SERVER_ERROR
- || statusCode == HttpStatus.SC_BAD_REQUEST) {
+ || statusCode == HttpStatus.SC_BAD_REQUEST || statusCode == HttpStatus.SC_NOT_FOUND) {
processResponse = true;
fault = true;
} else {
