From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sat, 27 Jan 2007 22:56:47 +0000 (+0000)
Subject: Port fix bug 41265 by removing the code that resets checkInterval values of zero... 
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=da0bd3e2b21d16e94185b1a66b76eb253576fe5e;p=tomcat7.0

Port fix bug 41265 by removing the code that resets checkInterval values of zero to 300. If 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.

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

diff --git a/java/org/apache/jasper/EmbeddedServletOptions.java b/java/org/apache/jasper/EmbeddedServletOptions.java
index b6a1c4c77..bfcb9aa34 100644
--- a/java/org/apache/jasper/EmbeddedServletOptions.java
+++ b/java/org/apache/jasper/EmbeddedServletOptions.java
@@ -496,12 +496,6 @@ public final class EmbeddedServletOptions implements Options {
         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"));
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 4cfd4f378..7147916ab 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -68,6 +68,11 @@
         Fix regression for implicit taglib and page data version numbers. (remm)
       </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>
         <bug>41327</bug>: Show full URI for a 404. Patch provided by Vijay.
         (markt)
       </fix>