Author: kkolinko
Date: Sun Dec 7 07:40:37 2014
New Revision: 1643654
URL: http://svn.apache.org/r1643654
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=57323
Correct display of outdated sessions in sessions count listing in Manager
application
Use separate slot for their counter.
Modified:
tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java
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=1643654&r1=1643653&r2=1643654&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java Sun Dec
7 07:40:37 2014
@@ -1172,7 +1172,7 @@ public class ManagerServlet extends Http
"managerServlet.sessiondefaultmax",
"" + maxInactiveInterval));
Session [] sessions = manager.findSessions();
- int [] timeout = new int[maxCount];
+ int[] timeout = new int[maxCount + 1];
int notimeout = 0;
int expired = 0;
for (int i = 0; i < sessions.length; i++) {
@@ -1185,7 +1185,7 @@ public class ManagerServlet extends Http
if (time < 0)
notimeout++;
else if (time >= maxCount)
- timeout[maxCount-1]++;
+ timeout[maxCount]++;
else
timeout[time]++;
}
@@ -1200,6 +1200,12 @@ public class ManagerServlet extends Http
"" + (i)*histoInterval + " - <" +
(i+1)*histoInterval,
"" + timeout[i]));
}
+ if (timeout[maxCount] > 0) {
+ writer.println(smClient.getString(
+ "managerServlet.sessiontimeout",
+ ">=" + maxCount*histoInterval,
+ "" + timeout[maxCount]));
+ }
if (notimeout > 0)
writer.println(smClient.getString(
"managerServlet.sessiontimeout.unlimited",
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
