This is an automated email from the ASF dual-hosted git repository. krisztiankasa pushed a commit to branch branch-2.7 in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/branch-2.7 by this push: new db7b179 AMBARI-25280 - Improper error handling when managing Ambari users (#2978) db7b179 is described below commit db7b17937328b6aa1f860efb4b01539a31913639 Author: kasakrisz <33458261+kasakr...@users.noreply.github.com> AuthorDate: Tue May 21 13:14:07 2019 +0200 AMBARI-25280 - Improper error handling when managing Ambari users (#2978) --- .../main/java/org/apache/ambari/server/api/services/ResultStatus.java | 2 +- .../java/org/apache/ambari/server/api/handlers/ReadHandlerTest.java | 2 +- .../ambari/server/api/services/serializers/JsonSerializerTest.java | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ResultStatus.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ResultStatus.java index d62e709..96f3061 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ResultStatus.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ResultStatus.java @@ -131,7 +131,7 @@ public class ResultStatus { */ public ResultStatus(STATUS status, Exception e) { m_status = status; - m_msg = e.toString(); + m_msg = e.getMessage(); } /** diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/handlers/ReadHandlerTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/handlers/ReadHandlerTest.java index e709c37..a721ac6 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/api/handlers/ReadHandlerTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/api/handlers/ReadHandlerTest.java @@ -174,7 +174,7 @@ public class ReadHandlerTest { ReadHandler handler = new ReadHandler(); Result result = handler.handleRequest(request); assertEquals(ResultStatus.STATUS.SERVER_ERROR, result.getStatus().getStatus()); - assertEquals(systemException.toString(), result.getStatus().getMessage()); + assertEquals(systemException.getMessage(), result.getStatus().getMessage()); verify(request, resource, query, predicate); } diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/serializers/JsonSerializerTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/serializers/JsonSerializerTest.java index a792a33..5cf5c19 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/serializers/JsonSerializerTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/serializers/JsonSerializerTest.java @@ -235,8 +235,7 @@ public class JsonSerializerTest { " \"error\" : {\n" + " \"key\" : \"key2\",\n" + " \"code\" : 403,\n" + - " \"message\" : \"org.apache.ambari.server.security.authorization.AuthorizationException:"+ - " The authenticated user is not authorized to perform the requested operation\"\n" + + " \"message\" : \"The authenticated user is not authorized to perform the requested operation\"\n" + " }\n" + " }\n" + " ]\n" +