Issue #4860 NPE from HttpFields
Paranoid catch if sending and exception page throws an exception. Signed-off-by: Greg Wilkins <gregw@webtide.com>
This commit is contained in:
parent
933ab641ee
commit
c497b61917
|
@ -432,8 +432,17 @@ public class HttpChannel implements Runnable, HttpOutput.Interceptor
|
|||
abort(x);
|
||||
else
|
||||
{
|
||||
_response.resetContent();
|
||||
sendResponseAndComplete();
|
||||
try
|
||||
{
|
||||
_response.resetContent();
|
||||
sendResponseAndComplete();
|
||||
}
|
||||
catch (Throwable t)
|
||||
{
|
||||
if (x != t)
|
||||
x.addSuppressed(t);
|
||||
abort(x);
|
||||
}
|
||||
}
|
||||
}
|
||||
finally
|
||||
|
|
Loading…
Reference in New Issue