- Don't URL encode JSP file path in the error log, when it does not exist.

Kin Man Chung · Kin Man Chung · commit 5efdb6941122 · 2011-05-02T23:40:23.000Z
svn path=/trunk/; revision=1379
diff --git a/impl/src/main/java/org/apache/jasper/servlet/JspServlet.java b/impl/src/main/java/org/apache/jasper/servlet/JspServlet.java
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997-2011 Oracle and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -441,15 +441,8 @@ private void serviceJspFile(HttpServletRequest request,
                 if (wrapper == null) {
                     // Check if the requested JSP page exists, to avoid
                     // creating unnecessary directories and files.
-                    /* START PWC 6181923
-                    if (null == context.getResource(jspUri)) {
-                    */
-                    // START PWC 6181923
                     if (null == context.getResource(jspUri)
                             && !options.getUsePrecompiled()) {
-                    // END PWC 6181923
-
-                        // START PWC 6300204
                         String includeRequestUri = (String) 
                             request.getAttribute("javax.servlet.include.request_uri");
                         if (includeRequestUri != null) {
@@ -463,22 +456,11 @@ private void serviceJspFile(HttpServletRequest request,
                             throw new FileNotFoundException(
                                 JspUtil.escapeXml(jspUri));
                         }
-                        // END PWC 6300204
 
-                        /* RIMOD PWC 6282167, 4878272
-                        response.sendError(HttpServletResponse.SC_NOT_FOUND,
-                                           jspUri);
-                        */
-                        // START PWC 6282167, 4878272
                         response.sendError(HttpServletResponse.SC_NOT_FOUND);
-                        String realPath = URLEncoder.encode(context.getRealPath(jspUri));
-                        if (realPath.length() > CHAR_LIMIT) {
-                            realPath = realPath.substring(0, CHAR_LIMIT);
-                        }
                         log.severe(Localizer.getMessage(
                             "jsp.error.file.not.found",
-                            realPath));
-                        // END PWC 6282167, 4878272
+                            context.getRealPath(jspUri)));
                         return;
                     }
                     boolean isErrorPage = exception != null;
