Issue #4279 Writer close deadlock (#4288)

Do not close the actual writer from closed.

Signed-off-by: Greg Wilkins <gregw@webtide.com>
This commit is contained in:
Greg Wilkins 2019-11-13 11:03:17 +11:00 committed by GitHub
parent fe4b9cf366
commit 24df8c59a3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -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;
}
}