diff options
Diffstat (limited to 'jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java')
| -rw-r--r-- | jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java | 38 |
1 files changed, 21 insertions, 17 deletions
diff --git a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java index 3a03ad2171..dcff963e3c 100644 --- a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java +++ b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java @@ -197,7 +197,14 @@ public class ServletHandler extends ScopedHandler { for (int i=_filters.length; i-->0;) { - try { _filters[i].stop(); }catch(Exception e){LOG.warn(Log.EXCEPTION,e);} + try + { + _filters[i].stop(); + } + catch(Exception e) + { + LOG.warn(Log.EXCEPTION,e); + } if (_filters[i].getSource() != Source.EMBEDDED) { //remove all of the mappings that were for non-embedded filters @@ -234,7 +241,14 @@ public class ServletHandler extends ScopedHandler { for (int i=_servlets.length; i-->0;) { - try { _servlets[i].stop(); }catch(Exception e){LOG.warn(Log.EXCEPTION,e);} + try + { + _servlets[i].stop(); + } + catch(Exception e) + { + LOG.warn(Log.EXCEPTION,e); + } if (_servlets[i].getSource() != Source.EMBEDDED) { @@ -525,35 +539,25 @@ public class ServletHandler extends ScopedHandler // unwrap cause Throwable th=e; - if (th instanceof UnavailableException) - { - LOG.debug(th); - } - else if (th instanceof ServletException) + if (th instanceof ServletException) { if (th instanceof QuietServletException) { - LOG.debug(th); LOG.warn(th.toString()); + LOG.debug(th); } else LOG.warn(th); } - // handle or log exception else if (th instanceof EofException) - throw (EofException)th; - else if (LOG.isDebugEnabled()) { - LOG.warn(request.getRequestURI(), th); - LOG.debug(request.toString()); - } - else if (th instanceof IOException || th instanceof UnavailableException) - { - LOG.debug(request.getRequestURI(),th); + throw (EofException)th; } else { LOG.warn(request.getRequestURI(),th); + if (LOG.isDebugEnabled()) + LOG.debug(request.toString()); } if (!response.isCommitted()) |