commit 5f5d53faa9afe7c5f75a6a8f15fcb1e112e20dcf
author Edwin Kempin <ekempin@google.com> Wed Jan 29 07:36:19 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jan 29 07:36:19 2020 +0000
tree 73a4017e9606baf50b3a2069451b8051c2ce9550
parent 02c02a888766a168053dbd53ea5d3f016def8c5c
parent 7592180692553a0c279b5a1c9069cc541a8c02a8

Merge "RestApiServlet: Do not reply ISE when another response has already been sent"

java/com/google/gerrit/httpd/restapi/RestApiServlet.java

diff --git a/java/com/google/gerrit/httpd/restapi/RestApiServlet.java b/java/com/google/gerrit/httpd/restapi/RestApiServlet.java
index a81a14e6..1fd0f82 100644
--- a/java/com/google/gerrit/httpd/restapi/RestApiServlet.java
+++ b/java/com/google/gerrit/httpd/restapi/RestApiServlet.java
@@ -697,8 +697,9 @@
 
           if (status.isPresent()) {
             responseBytes = reply(req, res, e, status.get(), getUserMessages(traceContext, e));
+          } else {
+            responseBytes = replyInternalServerError(req, res, e, getUserMessages(traceContext, e));
           }
-          responseBytes = replyInternalServerError(req, res, e, getUserMessages(traceContext, e));
         }
       } finally {
         String metric = getViewName(viewData);