Author: markt
Date: Mon Jul 28 20:40:54 2014
New Revision: 1614163
URL: http://svn.apache.org/r1614163
Log:
Correct the label in the list of sessions by idle time for the bin that
represents the idle time immediately below the maximum permitted idle time when
using the expire command of the Manager application.
Modified:
tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java?rev=1614163&r1=1614162&r2=1614163&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java Mon Jul
28 20:40:54 2014
@@ -1191,18 +1191,13 @@ public class ManagerServlet extends Http
writer.println(smClient.getString(
"managerServlet.sessiontimeout",
"<" + histoInterval, "" + timeout[0]));
- for (int i = 1; i < maxCount-1; i++) {
+ for (int i = 1; i < maxCount; i++) {
if (timeout[i] > 0)
writer.println(smClient.getString(
"managerServlet.sessiontimeout",
"" + (i)*histoInterval + " - <" +
(i+1)*histoInterval,
"" + timeout[i]));
}
- if (timeout[maxCount-1] > 0)
- writer.println(smClient.getString(
- "managerServlet.sessiontimeout",
- ">=" + maxCount*histoInterval,
- "" + timeout[maxCount-1]));
if (notimeout > 0)
writer.println(smClient.getString(
"managerServlet.sessiontimeout.unlimited",
@@ -1210,7 +1205,7 @@ public class ManagerServlet extends Http
if (idle >= 0)
writer.println(smClient.getString(
"managerServlet.sessiontimeout.expired",
- "" + idle,"" + expired));
+ ">" + idle,"" + expired));
} catch (Throwable t) {
ExceptionUtils.handleThrowable(t);
log("ManagerServlet.sessions[" + displayPath + "]", t);
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1614163&r1=1614162&r2=1614163&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Jul 28 20:40:54 2014
@@ -109,6 +109,15 @@
</fix>
</changelog>
</subsection>
+ <subsection name="Web applications">
+ <changelog>
+ <fix>
+ Correct the label in the list of sessions by idle time for the bin that
+ represents the idle time immediately below the maximum permitted idle
+ time when using the expire command of the Manager application. (markt)
+ </fix>
+ </changelog>
+ </subsection>
</section>
<section name="Tomcat 8.0.10 (markt)" rtext="not released">
<subsection name="Catalina">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
