Skip to content

Commit

Permalink
Merge tag 'ga-7.0.3' into develop
Browse files Browse the repository at this point in the history
Tagging ga-7.0.3
  • Loading branch information
jakobvogel committed Dec 9, 2022
2 parents a858408 + 436d6c6 commit cdb4b3e
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions src/main/java/sirius/web/controller/ControllerDispatcher.java
Original file line number Diff line number Diff line change
Expand Up @@ -223,10 +223,6 @@ private void performRoute(WebContext webContext, Route route, List<Object> param
}
} catch (InvocationTargetException ex) {
handleFailure(webContext, route, ex.getTargetException());
} catch (ClosedChannelException ex) {
// Especially a service call might re-throw this. As this simply states, the connection was
// closed while writing data, we can safely ignore it....
Exceptions.ignore(ex);
} catch (Exception ex) {
handleFailure(webContext, route, ex);
}
Expand Down Expand Up @@ -295,7 +291,8 @@ private void handleFailure(WebContext webContext, Route route, Throwable cause)
try {
// We never want to log or handle exceptions which are caused by the user which
// closed the browser / socket mid-processing...
if (cause instanceof ClosedChannelException && webContext.isResponseCommitted()) {
if ((cause instanceof ClosedChannelException || cause.getCause() instanceof ClosedChannelException)
&& webContext.isResponseCommitted()) {
Exceptions.ignore(cause);
return;
}
Expand Down

0 comments on commit cdb4b3e

Please sign in to comment.