luehe 2004/10/29 15:29:30 Modified: catalina/src/share/org/apache/catalina/servlets DefaultServlet.java LocalStrings.properties Log: Include warning message when an included resource is not available, instead of ignoring silently Revision Changes Path 1.30 +10 -1 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java Index: DefaultServlet.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- DefaultServlet.java 14 Oct 2004 23:58:38 -0000 1.29 +++ DefaultServlet.java 29 Oct 2004 22:29:29 -0000 1.30 @@ -657,7 +657,16 @@ Globals.INCLUDE_REQUEST_URI_ATTR); 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( + sm.getString("defaultServlet.missingResource", + requestUri)); } + response.sendError(HttpServletResponse.SC_NOT_FOUND, requestUri); return; 1.5 +1 -0 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/servlets/LocalStrings.properties Index: LocalStrings.properties =================================================================== RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/servlets/LocalStrings.properties,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- LocalStrings.properties 26 Mar 2003 09:53:10 -0000 1.4 +++ LocalStrings.properties 29 Oct 2004 22:29:29 -0000 1.5 @@ -1,3 +1,4 @@ +defaultServlet.missingResource=The requested resource ({0}) is not available defaultservlet.directorylistingfor=Directory Listing for: defaultservlet.upto=Up to: defaultservlet.subdirectories=Subdirectories:
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]