Author: remy.maucherat(a)jboss.com Date: 2009-08-31 13:38:52 -0400 (Mon, 31 Aug 2009) New Revision: 1153 Modified: trunk/java/org/apache/catalina/manager/ManagerServlet.java trunk/webapps/docs/changelog.xml Log: - Port divide by zero fix. Modified: trunk/java/org/apache/catalina/manager/ManagerServlet.java =================================================================== --- trunk/java/org/apache/catalina/manager/ManagerServlet.java 2009-08-31 15:12:09 UTC (rev 1152) +++ trunk/java/org/apache/catalina/manager/ManagerServlet.java 2009-08-31 17:38:52 UTC (rev 1153) @@ -1074,6 +1074,8 @@ int histoInterval = maxInactiveInterval / maxCount; if ( histoInterval * maxCount < maxInactiveInterval ) histoInterval++; + if (histoInterval == 0) + histoInterval = 1; maxCount = maxInactiveInterval / histoInterval; if ( histoInterval * maxCount < maxInactiveInterval ) maxCount++; Modified: trunk/webapps/docs/changelog.xml =================================================================== --- trunk/webapps/docs/changelog.xml 2009-08-31 15:12:09 UTC (rev 1152) +++ trunk/webapps/docs/changelog.xml 2009-08-31 17:38:52 UTC (rev 1153) @@ -130,6 +130,9 @@ <fix> Register filters with JMX. (markt) </fix> + <fix> + <bug>47705</bug>: Fix divide by zero in the manager sessions command. (funkman) + </fix> </changelog> </subsection> <subsection name="Coyote">