Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 0D5F7200B44 for ; Thu, 14 Jul 2016 13:47:56 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 0BA73160A63; Thu, 14 Jul 2016 11:47:56 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 54AF8160A52 for ; Thu, 14 Jul 2016 13:47:55 +0200 (CEST) Received: (qmail 23759 invoked by uid 500); 14 Jul 2016 11:47:54 -0000 Mailing-List: contact commits-help@olingo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@olingo.apache.org Delivered-To: mailing list commits@olingo.apache.org Received: (qmail 23750 invoked by uid 99); 14 Jul 2016 11:47:54 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 14 Jul 2016 11:47:54 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6EBBFE383A; Thu, 14 Jul 2016 11:47:54 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: chrisam@apache.org To: commits@olingo.apache.org Message-Id: <8c04a341548242c99b9cc71d81d7a1af@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: olingo-odata4 git commit: [OLINGO-979] corrected localized error message Date: Thu, 14 Jul 2016 11:47:54 +0000 (UTC) archived-at: Thu, 14 Jul 2016 11:47:56 -0000 Repository: olingo-odata4 Updated Branches: refs/heads/master a6bde3bee -> e916006e2 [OLINGO-979] corrected localized error message Signed-off-by: Christian Amend Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/e916006e Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/e916006e Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/e916006e Branch: refs/heads/master Commit: e916006e27f73e8469a3f20d5f7dfe7c9dbad372 Parents: a6bde3b Author: Morten Riedel Authored: Thu Jul 14 13:14:36 2016 +0200 Committer: Christian Amend Committed: Thu Jul 14 13:33:36 2016 +0200 ---------------------------------------------------------------------- .../java/org/apache/olingo/server/core/ODataExceptionHelper.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/e916006e/lib/server-core/src/main/java/org/apache/olingo/server/core/ODataExceptionHelper.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/ODataExceptionHelper.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/ODataExceptionHelper.java index e5117cd..f409903 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/ODataExceptionHelper.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/ODataExceptionHelper.java @@ -132,6 +132,7 @@ public class ODataExceptionHelper { serverError.setStatusCode(e.getStatusCode()); serverError.setLocale(e.getLocale()); serverError.setCode(e.getODataErrorCode()); + serverError.setMessage(e.getLocalizedMessage()); return serverError; } @@ -143,7 +144,7 @@ public class ODataExceptionHelper { } private static ODataServerError basicServerError(final Exception e) { - ODataServerError serverError = new ODataServerError().setException(e).setMessage(e.getLocalizedMessage()); + ODataServerError serverError = new ODataServerError().setException(e).setMessage(e.getMessage()); if (serverError.getMessage() == null) { serverError.setMessage("OData Library: An exception without message text was thrown."); }