Author: remy.maucherat(a)jboss.com
Date: 2011-10-27 12:52:51 -0400 (Thu, 27 Oct 2011)
New Revision: 1857
Modified:
trunk/java/org/apache/catalina/core/StandardContext.java
trunk/java/org/apache/catalina/session/PersistentManagerBase.java
trunk/java/org/apache/catalina/session/StandardManager.java
trunk/webapps/docs/changelog.xml
Log:
- Move setting session timeout to Context.start.
Modified: trunk/java/org/apache/catalina/core/StandardContext.java
===================================================================
--- trunk/java/org/apache/catalina/core/StandardContext.java 2011-10-27 16:25:57 UTC (rev
1856)
+++ trunk/java/org/apache/catalina/core/StandardContext.java 2011-10-27 16:52:51 UTC (rev
1857)
@@ -3804,6 +3804,11 @@
setManager(contextManager);
}
+ // Configure the session timeout
+ if (manager != null) {
+ manager.setMaxInactiveInterval(sessionTimeout * 60);
+ }
+
if (manager!=null && (getCluster() != null) &&
distributable) {
//let the cluster know that there is a context that is distributable
//and that it has its own manager
Modified: trunk/java/org/apache/catalina/session/PersistentManagerBase.java
===================================================================
--- trunk/java/org/apache/catalina/session/PersistentManagerBase.java 2011-10-27 16:25:57
UTC (rev 1856)
+++ trunk/java/org/apache/catalina/session/PersistentManagerBase.java 2011-10-27 16:52:51
UTC (rev 1857)
@@ -341,8 +341,6 @@
// Register with the new Container (if any)
if ((this.container != null) && (this.container instanceof Context)) {
- setMaxInactiveInterval
- ( ((Context) this.container).getSessionTimeout()*60 );
((Context) this.container).addPropertyChangeListener(this);
}
Modified: trunk/java/org/apache/catalina/session/StandardManager.java
===================================================================
--- trunk/java/org/apache/catalina/session/StandardManager.java 2011-10-27 16:25:57 UTC
(rev 1856)
+++ trunk/java/org/apache/catalina/session/StandardManager.java 2011-10-27 16:52:51 UTC
(rev 1857)
@@ -178,8 +178,6 @@
// Register with the new Container (if any)
if ((this.container != null) && (this.container instanceof Context)) {
- setMaxInactiveInterval
- ( ((Context) this.container).getSessionTimeout()*60 );
((Context) this.container).addPropertyChangeListener(this);
}
Modified: trunk/webapps/docs/changelog.xml
===================================================================
--- trunk/webapps/docs/changelog.xml 2011-10-27 16:25:57 UTC (rev 1856)
+++ trunk/webapps/docs/changelog.xml 2011-10-27 16:52:51 UTC (rev 1857)
@@ -25,6 +25,10 @@
<fix>
<jira>AS7-2073</jira>: Delegate connector lifecycle handling if in
delay mode. (jfclere, remm)
</fix>
+ <fix>
+ For compatibility with managers which don't extend StandardManager, set the
session timeout
+ from Context.start, so that it is always propagated. (remm)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
@@ -36,6 +40,10 @@
Add org.apache.tomcat.util.net.WAIT_FOR_THREAD system property to bring back
optional
blocking for the thread pool. (remm)
</fix>
+ <fix>
+ Add a limit on the number of parameters that can be parsed in a POST (1024 by
default,
+ configured with org.apache.tomcat.util.http.Parameters.MAX_COUNT). (remm)
+ </fix>
</changelog>
</subsection>
</section>
Show replies by date