JAMES-2625 Fix JMAPServlet jetty error from warning to info
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/d7f060d9 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/d7f060d9 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/d7f060d9 Branch: refs/heads/master Commit: d7f060d9d0dace02622594a46d39d9bcc4fad20f Parents: db1c5da Author: Gautier DI FOLCO <[email protected]> Authored: Tue Dec 11 14:25:38 2018 +0100 Committer: Raphael Ouazana <[email protected]> Committed: Tue Dec 18 10:10:13 2018 +0100 ---------------------------------------------------------------------- .../main/java/org/apache/james/jmap/JMAPServlet.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/d7f060d9/server/protocols/jmap/src/main/java/org/apache/james/jmap/JMAPServlet.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/JMAPServlet.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/JMAPServlet.java index c519a88..970a358 100644 --- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/JMAPServlet.java +++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/JMAPServlet.java @@ -21,6 +21,7 @@ package org.apache.james.jmap; import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST; import java.io.IOException; +import java.nio.channels.ClosedChannelException; import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; @@ -78,9 +79,9 @@ public class JMAPServlet extends HttpServlet { .collect(Collectors.toList()); resp.setContentType(JSON_CONTENT_TYPE); - objectMapper.writeValue(resp.getOutputStream(), responses); + sendResponses(resp, responses); } catch (IOException e) { - LOGGER.warn("error handling request", e); + LOGGER.warn("Error handling request", e); resp.setStatus(SC_BAD_REQUEST); } catch (Exception e) { LOGGER.error("Error handling request", e); @@ -90,6 +91,15 @@ public class JMAPServlet extends HttpServlet { } } + private void sendResponses(HttpServletResponse response, List<Object[]> responses) throws IOException { + try { + objectMapper.writeValue(response.getOutputStream(), responses); + } catch (ClosedChannelException e) { + LOGGER.info("Error sending response", e); + response.setStatus(SC_BAD_REQUEST); + } + } + private Stream<? extends ProtocolResponse> handle(AuthenticatedProtocolRequest request) { try { return requestHandler.handle(request); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
