From: markt Date: Sat, 4 Aug 2007 18:13:40 +0000 (+0000) Subject: Remove code testing for bug 37326 showed was not required. X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=641c47e7ecf451f74e8ee28b1dd84c7649d7be77;p=tomcat7.0 Remove code testing for bug 37326 showed was not required. git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@562752 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/java/org/apache/jasper/servlet/JspServletWrapper.java b/java/org/apache/jasper/servlet/JspServletWrapper.java index 99a43979d..48db4230e 100644 --- a/java/org/apache/jasper/servlet/JspServletWrapper.java +++ b/java/org/apache/jasper/servlet/JspServletWrapper.java @@ -333,25 +333,6 @@ public class JspServletWrapper { return; } - } catch (FileNotFoundException ex) { - ctxt.incrementRemoved(); - String includeRequestUri = (String) - request.getAttribute("javax.servlet.include.request_uri"); - if (includeRequestUri != null) { - // This file was included. Throw an exception as - // a response.sendError() will be ignored by the - // servlet engine. - throw new ServletException(ex); - } else { - try { - response.sendError(HttpServletResponse.SC_NOT_FOUND, - ex.getMessage()); - } catch (IllegalStateException ise) { - log.error(Localizer.getMessage("jsp.error.file.not.found", - ex.getMessage()), - ex); - } - } } catch (ServletException ex) { if (options.getDevelopment()) { throw handleJspException(ex);