Author: markt
Date: Mon Apr 18 13:41:37 2011
New Revision: 1094569
URL: http://svn.apache.org/viewvc?rev=1094569&view=rev
Log:
Correct a regression in the fix for
https://issues.apache.org/bugzilla/show_bug.cgi?id=49916 that resulted in JSPs
being compiled twice rather than just once.
Modified:
tomcat/trunk/java/org/apache/jasper/servlet/JspServlet.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/jasper/servlet/JspServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/servlet/JspServlet.java?rev=1094569&r1=1094568&r2=1094569&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/servlet/JspServlet.java (original)
+++ tomcat/trunk/java/org/apache/jasper/servlet/JspServlet.java Mon Apr 18
13:41:37 2011
@@ -125,7 +125,6 @@ public class JspServlet extends HttpServ
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
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1094569&r1=1094568&r2=1094569&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Apr 18 13:41:37 2011
@@ -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">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
