[axis-axis2-java-core] branch master updated (a0b2f76 -> 57c32e7)
This is an automated email from the ASF dual-hosted git repository. robertlazarski pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git. from a0b2f76 Bump jacoco-maven-plugin from 0.8.6 to 0.8.7 new 58e171e AXIS2-5999 Return HTTP 404 instead 500 on 'The service cannot be found' new 57c32e7 AXIS2-5999 Return HTTP 404 instead 500 on 'The service cannot be found' The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: modules/kernel/src/org/apache/axis2/engine/DispatchPhase.java | 7 +-- .../http/src/org/apache/axis2/transport/http/AxisServlet.java | 3 +++ 2 files changed, 8 insertions(+), 2 deletions(-)
[axis-axis2-java-core] 01/02: AXIS2-5999 Return HTTP 404 instead 500 on 'The service cannot be found'
This is an automated email from the ASF dual-hosted git repository.
robertlazarski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git
commit 58e171ee40da02adae303ab171189ceb5b82f4dc
Author: Robert Lazarski
AuthorDate: Wed May 12 12:09:21 2021 -0400
AXIS2-5999 Return HTTP 404 instead 500 on 'The service cannot be found'
---
modules/kernel/src/org/apache/axis2/engine/DispatchPhase.java | 7 +--
.../http/src/org/apache/axis2/transport/http/AxisServlet.java | 3 +++
2 files changed, 8 insertions(+), 2 deletions(-)
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.Log;
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 @@ public class DispatchPhase extends Phase {
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 @@ public class DispatchPhase extends Phase {
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 @@ public class DispatchPhase extends Phase {
|| 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..603ec95 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 @@ public class AxisServlet extends HttpServlet {
String status =
(String)
msgContext.getProperty(Constants.HTTP_RESPONSE_STATE);
if (status == null) {
+log.error("processAxisFault() found 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 HTTP status from the
MessageContext instance, setting HttpServletResponse status to: " + status);
res.setStatus(Integer.parseInt(status));
+return;
}
AxisBindingOperation axisBindingOperation =
[axis-axis2-java-core] 02/02: AXIS2-5999 Return HTTP 404 instead 500 on 'The service cannot be found'
This is an automated email from the ASF dual-hosted git repository.
robertlazarski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git
commit 57c32e791bc248958ecd2bf67a687fbd86070f0f
Author: Robert Lazarski
AuthorDate: Wed May 12 12:14:09 2021 -0400
AXIS2-5999 Return HTTP 404 instead 500 on 'The service cannot be found'
---
.../http/src/org/apache/axis2/transport/http/AxisServlet.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
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 603ec95..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,10 +392,10 @@ public class AxisServlet extends HttpServlet {
String status =
(String)
msgContext.getProperty(Constants.HTTP_RESPONSE_STATE);
if (status == null) {
-log.error("processAxisFault() found null HTTP status from
the MessageContext instance, setting HttpServletResponse status to: " +
Constants.HTTP_RESPONSE_STATE);
+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 HTTP status from the
MessageContext instance, setting HttpServletResponse status to: " + status);
+log.error("processAxisFault() found an HTTP status from
the MessageContext instance, setting HttpServletResponse status to: " + status);
res.setStatus(Integer.parseInt(status));
return;
}
[axis-axis2-java-core] branch master updated: AXIS2-5999 fix unit tests
This is an automated email from the ASF dual-hosted git repository.
robertlazarski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git
The following commit(s) were added to refs/heads/master by this push:
new 93d54be AXIS2-5999 fix unit tests
93d54be is described below
commit 93d54beb5186803ea7dcb4a806c88d9ae2ea774f
Author: Robert Lazarski
AuthorDate: Wed May 12 13:25:25 2021 -0400
AXIS2-5999 fix unit tests
---
.../transport/http/src/org/apache/axis2/transport/http/HTTPSender.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 @@ public abstract class HTTPSender {
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 {
[axis-axis2-java-core] branch dependabot/maven/spring.version-5.3.7 created (now 9426dae)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/spring.version-5.3.7 in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git. at 9426dae Bump spring.version from 5.3.6 to 5.3.7 No new revisions were added by this update.
[axis-axis2-java-core] branch dependabot/maven/tomcat.version-10.0.6 created (now 57c10f4)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/tomcat.version-10.0.6 in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git. at 57c10f4 Bump tomcat.version from 10.0.5 to 10.0.6 No new revisions were added by this update.
[axis-axis2-java-core] branch dependabot/maven/org.mockito-mockito-core-3.10.0 created (now f2f7f77)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.mockito-mockito-core-3.10.0 in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git. at f2f7f77 Bump mockito-core from 3.9.0 to 3.10.0 No new revisions were added by this update.
