← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/tomcat6/oneiric

« back to all changes in this revision

Viewing changes to java/org/apache/catalina/session/StandardSession.java

  • Committer: Bazaar Package Importer
  • Author(s): Thierry Carrez
  • Date: 2010-07-20 14:36:48 UTC
  • mfrom: (2.2.17 sid)
  • Revision ID: james.westby@ubuntu.com-20100720143648-23y81x6cq1kv1z00
Tags: 6.0.28-2
* Add debconf questions for user, group and Java options.
* Use ucf to install /etc/default/tomcat6 from a template
* Drop CATALINA_BASE and CATALINA_HOME from /etc/default/tomcat6 since we
  shouldn't encourage users to change those anyway

Show diffs side-by-side

added added

removed removed

Lines of Context:
java/org/apache/catalina/session/StandardSession.java
78
78
 * @author Craig R. McClanahan
79
79
 * @author Sean Legassick
80
80
 * @author <a href="mailto:jon@latchkey.com">Jon S. Stevens</a>
81
 
 * @version $Revision: 900131 $ $Date: 2010-01-17 13:46:53 +0100 (So, 17. Jan 2010) $
 
81
 * @version $Id: StandardSession.java 946841 2010-05-21 00:56:52Z kkolinko $
82
82
 */
83
83
 
84
84
public class StandardSession
750
750
                    manager.setSessionMaxAliveTime(timeAlive);
751
751
                }
752
752
                int numExpired = manager.getExpiredSessions();
753
 
                numExpired++;
754
 
                manager.setExpiredSessions(numExpired);
 
753
                if (numExpired < Integer.MAX_VALUE) {
 
754
                    numExpired++;
 
755
                    manager.setExpiredSessions(numExpired);
 
756
                }
 
757
 
755
758
                int average = manager.getSessionAverageAliveTime();
756
 
                average = ((average * (numExpired-1)) + timeAlive)/numExpired;
 
759
                // Using long, as otherwise (average * numExpired) might overflow 
 
760
                average = (int) (((((long) average) * (numExpired - 1)) + timeAlive)
 
761
                        / numExpired);
757
762
                manager.setSessionAverageAliveTime(average);
758
763
            }
759
764