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 3B69F200CE0 for ; Fri, 11 Aug 2017 06:08:27 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 39F0A16CC63; Fri, 11 Aug 2017 04:08:27 +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 8060816CC62 for ; Fri, 11 Aug 2017 06:08:26 +0200 (CEST) Received: (qmail 21775 invoked by uid 500); 11 Aug 2017 04:08:25 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 21766 invoked by uid 99); 11 Aug 2017 04:08:25 -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; Fri, 11 Aug 2017 04:08:25 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 68A4FE9456; Fri, 11 Aug 2017 04:08:25 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: akuznetsov@apache.org To: commits@ignite.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: ignite git commit: IGNITE-6012 Refactored GridJettyRestHandler.processRequest(): replace mapper.writeValueAsString with writeValue(stream, v). Date: Fri, 11 Aug 2017 04:08:25 +0000 (UTC) archived-at: Fri, 11 Aug 2017 04:08:27 -0000 Repository: ignite Updated Branches: refs/heads/master ebb8765ab -> 3a390c8af IGNITE-6012 Refactored GridJettyRestHandler.processRequest(): replace mapper.writeValueAsString with writeValue(stream, v). Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3a390c8a Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3a390c8a Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3a390c8a Branch: refs/heads/master Commit: 3a390c8afa157a54bdcde62a30159baebea87fb4 Parents: ebb8765 Author: Alexey Kuznetsov Authored: Fri Aug 11 11:07:26 2017 +0700 Committer: Alexey Kuznetsov Committed: Fri Aug 11 11:07:26 2017 +0700 ---------------------------------------------------------------------- .../http/jetty/GridJettyRestHandler.java | 31 +++++++------------- 1 file changed, 10 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/3a390c8a/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestHandler.java ---------------------------------------------------------------------- diff --git a/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestHandler.java b/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestHandler.java index c864a10..327c13a 100644 --- a/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestHandler.java +++ b/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestHandler.java @@ -34,6 +34,7 @@ import java.util.List; import java.util.Map; import java.util.UUID; import javax.servlet.ServletException; +import javax.servlet.ServletOutputStream; import javax.servlet.ServletRequest; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -356,41 +357,29 @@ public class GridJettyRestHandler extends AbstractHandler { U.error(log, "Failed to process HTTP request [action=" + act + ", req=" + req + ']', e); - cmdRes = new GridRestResponse(STATUS_FAILED, e.getMessage()); - if (e instanceof Error) throw (Error)e; - } - - String json; - try { - json = jsonMapper.writeValueAsString(cmdRes); + cmdRes = new GridRestResponse(STATUS_FAILED, e.getMessage()); } - catch (JsonProcessingException e1) { - U.error(log, "Failed to convert response to JSON: " + cmdRes, e1); - GridRestResponse resFailed = new GridRestResponse(STATUS_FAILED, e1.getMessage()); + try { + ServletOutputStream os = res.getOutputStream(); try { - json = jsonMapper.writeValueAsString(resFailed); + jsonMapper.writeValue(os, cmdRes); } - catch (JsonProcessingException e2) { - json = "{\"successStatus\": \"1\", \"error:\" \"" + e2.getMessage() + "\"}}"; - } - } - - try { - if (log.isDebugEnabled()) - log.debug("Parsed command response into JSON object: " + json); + catch (JsonProcessingException e) { + U.error(log, "Failed to convert response to JSON: " + cmdRes, e); - res.getWriter().write(json); + jsonMapper.writeValue(os, F.asMap("successStatus", STATUS_FAILED, "error", e.getMessage())); + } if (log.isDebugEnabled()) log.debug("Processed HTTP request [action=" + act + ", jsonRes=" + cmdRes + ", req=" + req + ']'); } catch (IOException e) { - U.error(log, "Failed to send HTTP response: " + json, e); + U.error(log, "Failed to send HTTP response: " + cmdRes, e); } }