From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 22 Mar 2010 21:38:52 +0000 (+0000)
Subject: SRV.9.3 says we must throw a FNFE
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=19b6edc14e90f4a52af0a2898a908fa64a108a3b;p=tomcat7.0

SRV.9.3 says we must throw a FNFE

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@926355 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/java/org/apache/catalina/servlets/DefaultServlet.java b/java/org/apache/catalina/servlets/DefaultServlet.java
index 59ecc4970..b94dbed0f 100644
--- a/java/org/apache/catalina/servlets/DefaultServlet.java
+++ b/java/org/apache/catalina/servlets/DefaultServlet.java
@@ -24,6 +24,7 @@ import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -703,13 +704,11 @@ public class DefaultServlet
             if (requestUri == null) {
                 requestUri = request.getRequestURI();
             } else {
-                // We're included, and the response.sendError() below is going
-                // to be ignored by the resource that is including us.
-                // Therefore, the only way we can let the including resource
-                // know is by including warning message in response
-                response.getWriter().write(RequestUtil.filter(
-                    sm.getString("defaultServlet.missingResource",
-                    requestUri)));
+                // We're included
+                // SRV.9.3 says we must throw a FNFE
+                throw new FileNotFoundException(
+                        sm.getString("defaultServlet.missingResource",
+                    requestUri));
             }
 
             response.sendError(HttpServletResponse.SC_NOT_FOUND,