You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by li...@apache.org on 2022/03/30 06:01:14 UTC
[servicecomb-java-chassis] branch master updated: [SCB-2433] Edge service exception handle do not sent unexpected message (#2757)
This is an automated email from the ASF dual-hosted git repository.
liubao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-java-chassis.git
The following commit(s) were added to refs/heads/master by this push:
new 3a5196f [SCB-2433] Edge service exception handle do not sent unexpected message (#2757)
3a5196f is described below
commit 3a5196f7f10026e5ab16958fa22cdce748cf81a9
Author: david6969xin <86...@users.noreply.github.com>
AuthorDate: Wed Mar 30 14:01:07 2022 +0800
[SCB-2433] Edge service exception handle do not sent unexpected message (#2757)
---
.../apache/servicecomb/demo/jaxrs/client/TestFormRequestSchema.java | 2 +-
.../apache/servicecomb/transport/rest/vertx/VertxRestDispatcher.java | 3 ++-
.../servicecomb/transport/rest/vertx/TestVertxRestDispatcher.java | 2 +-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/demo/demo-jaxrs/jaxrs-client/src/main/java/org/apache/servicecomb/demo/jaxrs/client/TestFormRequestSchema.java b/demo/demo-jaxrs/jaxrs-client/src/main/java/org/apache/servicecomb/demo/jaxrs/client/TestFormRequestSchema.java
index c243c9d..5ce08f8 100644
--- a/demo/demo-jaxrs/jaxrs-client/src/main/java/org/apache/servicecomb/demo/jaxrs/client/TestFormRequestSchema.java
+++ b/demo/demo-jaxrs/jaxrs-client/src/main/java/org/apache/servicecomb/demo/jaxrs/client/TestFormRequestSchema.java
@@ -83,7 +83,7 @@ public class TestFormRequestSchema implements CategorizedTestCase {
restTemplate.postForEntity("cse://jaxrs/form/formRequest", requestEntity, String.class);
TestMgr.fail("Size exceed allowed maximum capacity");
} catch (Throwable e) {
- TestMgr.check(e.getMessage().contains("Size exceed allowed maximum capacity"), true);
+ TestMgr.check(e.getMessage().contains("Internal Server Error"), true);
}
}
}
diff --git a/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/VertxRestDispatcher.java b/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/VertxRestDispatcher.java
index 9782994..acb4b32 100644
--- a/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/VertxRestDispatcher.java
+++ b/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/VertxRestDispatcher.java
@@ -151,7 +151,8 @@ public class VertxRestDispatcher extends AbstractVertxHttpDispatcher {
.end(wrapResponseBody(invocationException.getReasonPhrase()));
} else {
context.response().putHeader(HttpHeaders.CONTENT_TYPE, MediaType.WILDCARD)
- .setStatusCode(Status.INTERNAL_SERVER_ERROR.getStatusCode()).end(wrapResponseBody(e.getMessage()));
+ .setStatusCode(Status.INTERNAL_SERVER_ERROR.getStatusCode())
+ .end(wrapResponseBody(Status.INTERNAL_SERVER_ERROR.getReasonPhrase()));
}
context.response().close();
}
diff --git a/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/TestVertxRestDispatcher.java b/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/TestVertxRestDispatcher.java
index 9d26472..7a1f6d7 100644
--- a/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/TestVertxRestDispatcher.java
+++ b/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/TestVertxRestDispatcher.java
@@ -211,7 +211,7 @@ public class TestVertxRestDispatcher {
@Test
public void failureHandlerWithNoRestProducerInvocationAndOtherException(@Mocked RoutingContext context) {
- String exceptionMessage = "test exception message";
+ String exceptionMessage = "Internal Server Error";
Exception exception = new Exception(exceptionMessage);
MockHttpServerResponse response = new MockHttpServerResponse();
new Expectations() {