summaryrefslogtreecommitdiffstats
path: root/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ServletOutputStreamWriter.java
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@yahoo-inc.com>2016-12-13 10:04:41 +0100
committerBjørn Christian Seime <bjorncs@yahoo-inc.com>2016-12-13 10:08:25 +0100
commite596c28f26a7508c5255e7b45b592aba5dcd1df8 (patch)
tree8326f90841e9a70f5b0578e7cefc3b0d296e2754 /jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ServletOutputStreamWriter.java
parentd377c98a3e13ea071cce48ec2f72e3bc09c91316 (diff)
Check for finished state in case other threads has called setFinished
Diffstat (limited to 'jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ServletOutputStreamWriter.java')
-rw-r--r--jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ServletOutputStreamWriter.java3
1 files changed, 3 insertions, 0 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 9db9ae3445f..4ad181d2bf6 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
@@ -158,6 +158,9 @@ public class ServletOutputStreamWriter {
ResponseContentPart contentPart;
synchronized (monitor) {
+ if (state == State.FINISHED_OR_ERROR) {
+ return;
+ }
assertStateIs(state, State.WRITING_BUFFERS);
if (!outputStream.isReady()) {