Make sure, we mention the unit "seconds" for

jspIdleTimeout everywhere.

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

diff --git a/java/org/apache/jasper/EmbeddedServletOptions.java b/java/org/apache/jasper/EmbeddedServletOptions.java
index f1fdaa9..a430457 100644 (file)
--- a/java/org/apache/jasper/EmbeddedServletOptions.java
+++ b/java/org/apache/jasper/EmbeddedServletOptions.java
@@ -195,7 +195,7 @@ public final class EmbeddedServletOptions implements Options {
     private int maxLoadedJsps = -1;
 
     /**
-     * The idle time after which a JSP is unloaded.
+     * The idle time in seconds after which a JSP is unloaded.
      * If unset or less or equal than 0, no jsps are unloaded.
      */
     private int jspIdleTimeout = -1;
@@ -405,7 +405,7 @@ public final class EmbeddedServletOptions implements Options {
     }
 
     /**
-     * Should any jsps be unloaded when being idle for to long?
+     * Should any jsps be unloaded when being idle for this time in seconds?
      * If set to a value greater than 0 eviction of jsps is started. Default: -1
      */
     public int getJspIdleTimeout() {

diff --git a/java/org/apache/jasper/Options.java b/java/org/apache/jasper/Options.java
index b30d046..55c0a00 100644 (file)
--- a/java/org/apache/jasper/Options.java
+++ b/java/org/apache/jasper/Options.java
@@ -229,7 +229,7 @@ public interface Options {
     public int getMaxLoadedJsps();
     
     /**
-     * The idle time after which a JSP is unloaded.
+     * The idle time in seconds after which a JSP is unloaded.
      * If unset or less or equal than 0, no jsps are unloaded.
      */
     public int getJspIdleTimeout();

diff --git a/java/org/apache/jasper/compiler/JspRuntimeContext.java b/java/org/apache/jasper/compiler/JspRuntimeContext.java
index 2cb08d2..215b29d 100644 (file)
--- a/java/org/apache/jasper/compiler/JspRuntimeContext.java
+++ b/java/org/apache/jasper/compiler/JspRuntimeContext.java
@@ -160,6 +160,7 @@ public final class JspRuntimeContext {
             jspQueue = new FastRemovalDequeue<JspServletWrapper>(options.getMaxLoadedJsps());
         }
 
+        /* Init parameter is in seconds, locally we use milliseconds */
         jspIdleTimeout = options.getJspIdleTimeout() * 1000;
     }
 
@@ -176,6 +177,7 @@ public final class JspRuntimeContext {
     private final String classpath;
     private volatile long lastCompileCheck = -1L;
     private volatile long lastJspQueueUpdate = System.currentTimeMillis();
+    /* JSP idle timeout in milliseconds */
     private long jspIdleTimeout;
 
     /**