Merge pull request #4290 from eclipse/jetty-9.4.x-4269-restore-PrintW…

…riter-contract Issue #4269 - Restoring PrintWriter contract on errors
jetty · Dec 2, 2019 · d99ae19 · d99ae19
2 parents c9a65c4 + ff7adab
commit d99ae19
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/ResponseWriter.java b/jetty-server/src/main/java/org/eclipse/jetty/server/ResponseWriter.java
@@ -128,10 +128,13 @@ protected void setError()
     private void isOpen() throws IOException
     {
         if (_ioException != null)
-            throw new RuntimeIOException(_ioException);
+            throw _ioException;
 
         if (_isClosed)
-            throw new EofException("Stream closed");
+        {
+            _ioException = new EofException("Stream closed");
+            throw _ioException;
+        }
     }
 
     @Override

diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/ResponseTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/ResponseTest.java
@@ -54,7 +54,6 @@
 import org.eclipse.jetty.http.MetaData;
 import org.eclipse.jetty.io.AbstractEndPoint;
 import org.eclipse.jetty.io.ByteArrayEndPoint;
-import org.eclipse.jetty.io.RuntimeIOException;
 import org.eclipse.jetty.server.handler.AbstractHandler;
 import org.eclipse.jetty.server.handler.ContextHandler;
 import org.eclipse.jetty.server.handler.ErrorHandler;
@@ -711,7 +710,7 @@ public void testStatusCodesNoErrorHandler(int code, String message, String expec
     }
 
     @Test
-    public void testWriteRuntimeIOException() throws Exception
+    public void testWriteCheckError() throws Exception
     {
         Response response = getResponse();
 
@@ -725,8 +724,8 @@ public void testWriteRuntimeIOException() throws Exception
         writer.println("test");
         assertTrue(writer.checkError());
 
-        RuntimeIOException e = assertThrows(RuntimeIOException.class, () -> writer.println("test"));
-        assertEquals(cause, e.getCause());
+        writer.println("test"); // this should not cause an Exception
+        assertTrue(writer.checkError());
     }
 
     @Test