Simplify writeBuffersInQueueToOutputStream

1 files changed, 2 insertions, 4 deletions

diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ServletOutputStreamWriter.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ServletOutputStreamWriter.java
index eb782737a0c..ec05f68ed01 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ServletOutputStreamWriter.java
+++ b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ServletOutputStreamWriter.java
@@ -155,10 +155,6 @@ public class ServletOutputStreamWriter {
             ResponseContentPart contentPart;
 
             synchronized (monitor) {
-                if (state == State.FINISHED_OR_ERROR) {
-                    return;
-                }
-
                 assertStateIs(state, State.WRITING_BUFFERS);
 
                 if (!outputStream.isReady()) {
@@ -186,11 +182,13 @@ public class ServletOutputStreamWriter {
                 if (contentPart.buf == CLOSE_STREAM_BUFFER) {
                     contentPart.handler.completed();
                     setFinished(Optional.empty());
+                    return;
                 } else {
                     writeBufferToOutputStream(contentPart);
                 }
             } catch (Throwable e) {
                 setFinished(Optional.of(e));
+                return;
             }
         }
     }