From: Teryk Bellahsene <teryk.bellahsene@sonarsource.com>
Date: Fri, 29 Dec 2017 14:54:59 +0000 (+0100)
Subject: SONAR-10154 Do not reset WS response if it is streamed
X-Git-Tag: 7.0-RC1~70
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=b84b2196e575c1917757e2d03c025b9ab305b171;p=sonarqube.git

SONAR-10154 Do not reset WS response if it is streamed
---

diff --git a/server/sonar-server/src/main/java/org/sonar/server/ws/WebServiceEngine.java b/server/sonar-server/src/main/java/org/sonar/server/ws/WebServiceEngine.java
index 8455de88e13..01bbac4685c 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/ws/WebServiceEngine.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/ws/WebServiceEngine.java
@@ -132,6 +132,10 @@ public class WebServiceEngine implements LocalConnector, Startable {
   private static void sendErrors(Response response, int status, List<String> errors) {
     Response.Stream stream = response.stream();
     if (stream instanceof ServletResponse.ServletStream) {
+      if (((ServletResponse.ServletStream) stream).response().isCommitted()) {
+        // streaming of response. It's no more possible to clear and reformat the response
+        return;
+      }
       ((ServletResponse.ServletStream) stream).reset();
     }
     stream.setStatus(status);