Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

updates from review

This commit is contained in:
gregw 2021-02-11 15:01:00 +01:00
parent 769687f773
commit e2c710e086
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java
View File

@ -384,7 +384,7 @@ public class HttpConnection extends AbstractConnection implements Runnable, Http
} }
// Handle connection upgrades // Handle connection upgrades
if (_channel.getResponse().getStatus() == HttpStatus.SWITCHING_PROTOCOLS_101) else if (_channel.getResponse().getStatus() == HttpStatus.SWITCHING_PROTOCOLS_101)
{ {
Connection connection = (Connection)_channel.getRequest().getAttribute(UPGRADE_CONNECTION_ATTRIBUTE); Connection connection = (Connection)_channel.getRequest().getAttribute(UPGRADE_CONNECTION_ATTRIBUTE);
if (connection != null) if (connection != null)

2
jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
View File

@ -436,8 +436,8 @@ public class HttpOutput extends ServletOutputStream implements Runnable
// If we can't complete due to the API state, then abort // If we can't complete due to the API state, then abort
if (error != null) if (error != null)
{ {
_writeBlocker.fail(error);
_channel.abort(error); _channel.abort(error);
_writeBlocker.fail(error);
_state = State.CLOSED; _state = State.CLOSED;
} }
else else