Author: kkolinko
Date: Sun Dec 7 07:45:54 2014
New Revision: 1643655
URL: http://svn.apache.org/r1643655
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.
Merged r1643654 from tomcat/trunk.
Modified:
tomcat/tc8.0.x/trunk/ (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/catalina/manager/ManagerServlet.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc8.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Dec 7 07:45:54 2014
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1643002,1643045,1643054-1643055,1643066,1643121,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643570,1643634,1643649,1643651
+/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1643002,1643045,1643054-1643055,1643066,1643121,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643570,1643634,1643649,1643651,1643654
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/manager/ManagerServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/manager/ManagerServlet.java?rev=1643655&r1=1643654&r2=1643655&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/manager/ManagerServlet.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/manager/ManagerServlet.java
Sun Dec 7 07:45:54 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",
Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1643655&r1=1643654&r2=1643655&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Sun Dec 7 07:45:54 2014
@@ -196,6 +196,10 @@
Fix ambiguity of section links on Valves configuration reference page.
(kkolinko)
</fix>
+ <fix>
+ <bug>57323</bug>: Correct display of outdated sessions in sessions
+ count listing in Manager application. (kkolinko)
+ </fix>
</changelog>
</subsection>
<subsection name="Other">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
