svn commit: r1028950 - in /tomcat/trunk/java/org/apache/jasper: EmbeddedServletOptions.java Options.java compiler/JspRuntimeContext.java

[rj...@apache.org]

Author: rjung
Date: Fri Oct 29 23:53:15 2010
New Revision: 1028950

URL: http://svn.apache.org/viewvc?rev=1028950&view=rev
Log:
Make sure, we mention the unit "seconds" for
jspIdleTimeout everywhere.

Modified:
    tomcat/trunk/java/org/apache/jasper/EmbeddedServletOptions.java
    tomcat/trunk/java/org/apache/jasper/Options.java
    tomcat/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java

Modified: tomcat/trunk/java/org/apache/jasper/EmbeddedServletOptions.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/EmbeddedServletOptions.java?rev=1028950&r1=1028949&r2=1028950&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/EmbeddedServletOptions.java (original)
+++ tomcat/trunk/java/org/apache/jasper/EmbeddedServletOptions.java Fri Oct 29 23:53:15 2010
@@ -195,7 +195,7 @@ public final class EmbeddedServletOption
     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 EmbeddedServletOption
     }
 
     /**
-     * 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() {

Modified: tomcat/trunk/java/org/apache/jasper/Options.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/Options.java?rev=1028950&r1=1028949&r2=1028950&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/Options.java (original)
+++ tomcat/trunk/java/org/apache/jasper/Options.java Fri Oct 29 23:53:15 2010
@@ -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();

Modified: tomcat/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java?rev=1028950&r1=1028949&r2=1028950&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java Fri Oct 29 23:53:15 2010
@@ -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;
 
     /**



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org