Correct a regression in the fix for https://issues.apache.org/bugzilla/show_bug.cgi...

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

diff --git a/java/org/apache/jasper/servlet/JspServlet.java b/java/org/apache/jasper/servlet/JspServlet.java
index db0d51f..c72d114 100644 (file)
--- a/java/org/apache/jasper/servlet/JspServlet.java
+++ b/java/org/apache/jasper/servlet/JspServlet.java
@@ -125,7 +125,6 @@ public class JspServlet extends HttpServlet implements PeriodicEventListener {
                 throw new ServletException("Can not locate jsp file", e);
             }
             try {
-                serviceJspFile(null, null, jspFile, null, true);
                 if (SecurityUtil.isPackageProtectionEnabled()){
                    AccessController.doPrivileged(new PrivilegedExceptionAction<Object>(){
                         @Override

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index cffcb46..e341891 100644 (file)
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -100,6 +100,10 @@
         Label JSP/tag file line and column numbers when reporting errors since
         it may not be immediately obvious what the numbers represent. (markt)
       </add>
+      <fix>
+        Correct a regression in the fix for <bug>49916</bug> that resulted in
+        JSPs being compiled twice rather than just once. (markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Web applications">