From 24df8c59a3fb24a235b8bd015e7f9b3414f89136 Mon Sep 17 00:00:00 2001 From: Greg Wilkins Date: Wed, 13 Nov 2019 11:03:17 +1100 Subject: [PATCH] Issue #4279 Writer close deadlock (#4288) Do not close the actual writer from closed. Signed-off-by: Greg Wilkins --- .../org/eclipse/jetty/server/HttpOutput.java | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java index b4849407f1d..70fbf4868e7 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java @@ -425,22 +425,7 @@ public class HttpOutput extends ServletOutputStream implements Runnable if (!_state.compareAndSet(state, State.CLOSED)) break; - // Just make sure write and output stream really are closed - try - { - _channel.getResponse().closeOutput(); - } - catch (Throwable x) - { - if (LOG.isDebugEnabled()) - LOG.debug(x); - abort(x); - } - finally - { - releaseBuffer(); - } - // Return even if an exception is thrown by closeOutput(). + releaseBuffer(); return; } }