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

Merged branch 'jetty-9.4.x' into 'master'.

This commit is contained in:
Simone Bordet 2017-08-01 14:25:55 +02:00
parent f7302a13b4 29d4fcf80e
commit a5a2a2f28c
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
jetty-server/src/main/java/org/eclipse/jetty/server/HttpInput.java
View File

@ -794,14 +794,17 @@ public class HttpInput extends ServletInputStream implements Runnable
{
if (_state instanceof ErrorState)
{
IOException failure = new IOException(x);
// Log both the original and current failure
// without modifying the original failure.
Throwable failure = new Throwable(((ErrorState)_state).getError());
failure.addSuppressed(x);
LOG.warn(failure);
_state.getError().addSuppressed(failure);
}
else
{
// Add a suppressed throwable to capture this stack trace
x.addSuppressed(new IOException("HttpInput failed"));
// Add a suppressed throwable to capture this stack
// trace without wrapping/hiding the original failure.
x.addSuppressed(new Throwable("HttpInput failure"));
_state = new ErrorState(x);
}