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

474634 - AsyncListener.onError() handling. 

Allow IOException from complete flush to goto an onError call.
This commit is contained in:
Greg Wilkins 2015-08-13 19:09:57 +10:00
parent 108821aacb
commit 9b9b9524dc
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
View File

@ -381,18 +381,12 @@ public class HttpChannel implements Runnable, HttpOutput.Interceptor
case COMPLETE:
{
try
{
if (!_response.isCommitted() && !_request.isHandled())
_response.sendError(404);
else
_response.closeOutput();
}
finally
{
_state.onComplete();
}
if (!_response.isCommitted() && !_request.isHandled())
_response.sendError(404);
else
_response.closeOutput();
_state.onComplete();
// TODO: verify this code is needed and whether
// TODO: it's needed for onError() case too.
_request.setHandled(true);
@ -468,6 +462,7 @@ public class HttpChannel implements Runnable, HttpOutput.Interceptor
return;
}
// TODO Can this happen? Should this just be ISE???
// We've already processed an error before!
root.addSuppressed(x);
LOG.warn("Error while handling async error: ",root);
@ -504,7 +499,7 @@ public class HttpChannel implements Runnable, HttpOutput.Interceptor
_response.sendError(HttpStatus.SERVICE_UNAVAILABLE_503);
}
else
_response.sendError(HttpStatus.INTERNAL_SERVER_ERROR_500, x.getClass().toString());
_response.sendError(HttpStatus.INTERNAL_SERVER_ERROR_500);
}
}
catch (IOException e)