Author: markt
Date: Fri Jan 19 19:38:23 2007
New Revision: 498058
URL: http://svn.apache.org/viewvc?view=rev&rev=498058
Log:
Fix bug 41265 by removing the code that resets checkInterval values of zero to
300. If not checkInterval is not specified it defaults to zero anyway and
removing the code was easier than trying to explain in the documentation why
the stated default could not be explicitly set.
Modified:
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/EmbeddedServletOptions.java
Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?view=diff&rev=498058&r1=498057&r2=498058
==============================================================================
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Fri Jan 19 19:38:23 2007
@@ -275,6 +275,11 @@
(markt)
</fix>
<fix>
+ <bug>41265</bug>: Allow JspServlet checkInterval init parameter to be
+ explicitly set to the stated default value of zero by removing the
+ code that resets it to 300 if explicitly specified as zero. (markt)
+ </fix>
+ <fix>
Display the JSP source when a compilation error occurs and display
the correct line number rather than start of a scriptlet block. (markt)
</fix>
Modified:
tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/EmbeddedServletOptions.java
URL:
http://svn.apache.org/viewvc/tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/EmbeddedServletOptions.java?view=diff&rev=498058&r1=498057&r2=498058
==============================================================================
---
tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/EmbeddedServletOptions.java
(original)
+++
tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/EmbeddedServletOptions.java
Fri Jan 19 19:38:23 2007
@@ -469,12 +469,6 @@
if (checkInterval != null) {
try {
this.checkInterval = Integer.parseInt(checkInterval);
- if (this.checkInterval == 0) {
- this.checkInterval = 300;
- if (log.isWarnEnabled()) {
-
log.warn(Localizer.getMessage("jsp.warning.checkInterval"));
- }
- }
} catch(NumberFormatException ex) {
if (log.isWarnEnabled()) {
log.warn(Localizer.getMessage("jsp.warning.checkInterval"));
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
