Author: markt
Date: Sat Feb 27 22:19:48 2016
New Revision: 1732675
URL: http://svn.apache.org/viewvc?rev=1732675&view=rev
Log:
Correct a regression introduced in 7.0.68 where the deprecated
Manager.getMaxInactiveInterval() method returned the current default session
timeout in minutes rather than seconds.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/session/ManagerBase.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/session/ManagerBase.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/session/ManagerBase.java?rev=1732675&r1=1732674&r2=1732675&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/session/ManagerBase.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/session/ManagerBase.java Sat
Feb 27 22:19:48 2016
@@ -423,7 +423,8 @@ public abstract class ManagerBase extend
public int getMaxInactiveInterval() {
Container container = getContainer();
if (container instanceof Context) {
- return ((Context) container).getSessionTimeout();
+ // This method returns seconds, the Context uses minutes
+ return ((Context) container).getSessionTimeout() * 60;
}
return -1;
}
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1732675&r1=1732674&r2=1732675&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Sat Feb 27 22:19:48 2016
@@ -84,6 +84,11 @@
timeout via the deprecated (and ignored)
<code>Manager.setMaxInactiveInterval()</code> method. (markt)
</add>
+ <fix>
+ Correct a regression introduced in 7.0.68 where the deprecated
+ <code>Manager.getMaxInactiveInterval()</code> method returned the
+ current default session timeout in minutes rather than seconds. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
