ensure channel is closed if we fail in NOT_STARTED state.

1 files changed, 6 insertions, 2 deletions

diff --git a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/ServletRequestReader.java b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/ServletRequestReader.java
index bcef4af6620..3703878f595 100644
--- a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/ServletRequestReader.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/ServletRequestReader.java
@@ -217,8 +217,12 @@ class ServletRequestReader {
 
         synchronized (monitor) {
             errorDuringRead = t;
-            if (state != State.READING) return;
-            state = State.ALL_DATA_READ;
+            if (state == State.REQUEST_CONTENT_CLOSED) {
+                return;
+            }
+            if (state == State.READING) {
+                state = State.ALL_DATA_READ;
+            }
             shouldCloseRequestContentChannel = numberOfOutstandingUserCalls == 0;
             if (shouldCloseRequestContentChannel) {
                 state = State.REQUEST_CONTENT_CLOSED;