ee10: DefaultServlet: Replace checks for isStreaming() by !isWriting()

Checking for isStreaming() will return false even when no data has been written yet. This erroneously triggers double-encoding of binary data in a Writer. If the Writer is not set to ISO-8859-1 or similar, the output will be corrupted, causing errors like "java.io.IOException: written 25746 > 12014 content-length", and interrupted transmissions. Replace the isStreaming() check by !isWriting(). #9134 Signed-off-by: Christian Kohlschütter <[email protected]>
jetty · Jan 10, 2023 · 12d4573 · 12d4573
1 parent 177bafb
commit 12d4573
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/...-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/DefaultServlet.java b/...-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/DefaultServlet.java
@@ -802,10 +802,10 @@ public boolean isWritingOrStreaming()
             return servletContextResponse.isWritingOrStreaming();
         }
 
-        public boolean isStreaming()
+        public boolean isWriting()
         {
             ServletContextResponse servletContextResponse = Response.as(_coreResponse, ServletContextResponse.class);
-            return servletContextResponse.isStreaming();
+            return servletContextResponse.isWriting();
         }
 
         @Override
@@ -815,13 +815,7 @@ public void write(boolean last, ByteBuffer byteBuffer, Callback callback)
             {
                 if (BufferUtil.hasContent(byteBuffer))
                 {
-                    if (isStreaming())
-                    {
-                        BufferUtil.writeTo(byteBuffer, _response.getOutputStream());
-                        if (last)
-                            _response.getOutputStream().close();
-                    }
-                    else
+                    if (isWriting())
                     {
                         String characterEncoding = _response.getCharacterEncoding();
                         try (ByteBufferInputStream bbis = new ByteBufferInputStream(byteBuffer);
@@ -833,6 +827,12 @@ public void write(boolean last, ByteBuffer byteBuffer, Callback callback)
                         if (last)
                             _response.getWriter().close();
                     }
+                    else
+                    {
+                        BufferUtil.writeTo(byteBuffer, _response.getOutputStream());
+                        if (last)
+                            _response.getOutputStream().close();
+                    }
                 }
 
                 callback.succeeded();