Author: kfujino
Date: Tue Mar 11 07:59:08 2014
New Revision: 1576218
URL: http://svn.apache.org/r1576218
Log:
Fixed java.lang.NegativeArraySizeException when execute the command of Expire
sessions of manager web application to context in which the session timeout is
disabled.
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=1576218&r1=1576217&r2=1576218&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java Tue Mar
11 07:59:08 2014
@@ -1146,15 +1146,18 @@ public class ManagerServlet extends Http
return;
}
int maxCount = 60;
+ int histoInterval = 1;
int maxInactiveInterval = manager.getMaxInactiveInterval()/60;
- int histoInterval = maxInactiveInterval / maxCount;
- if ( histoInterval * maxCount < maxInactiveInterval )
- histoInterval++;
- if (0==histoInterval)
- histoInterval=1;
- maxCount = maxInactiveInterval / histoInterval;
- if ( histoInterval * maxCount < maxInactiveInterval )
- maxCount++;
+ if (maxInactiveInterval > 0) {
+ histoInterval = maxInactiveInterval / maxCount;
+ if (histoInterval * maxCount < maxInactiveInterval)
+ histoInterval++;
+ if (0 == histoInterval)
+ histoInterval = 1;
+ maxCount = maxInactiveInterval / histoInterval;
+ if (histoInterval * maxCount < maxInactiveInterval)
+ maxCount++;
+ }
writer.println(smClient.getString("managerServlet.sessions",
displayPath));
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1576218&r1=1576217&r2=1576218&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Mar 11 07:59:08 2014
@@ -165,6 +165,11 @@
table cell containing the request information on the Manager
application
status page. (markt)
</fix>
+ <fix>
+ Fixed <code>java.lang.NegativeArraySizeException</code> when execute
the
+ command of Expire sessions of manager web application to context in
+ which the session timeout is disabled. (kfujino)
+ </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
