Author: kfujino
Date: Thu Apr 15 09:19:02 2010
New Revision: 934337
URL: http://svn.apache.org/viewvc?rev=934337&view=rev
Log:
sessionCounter and expiredSessions declares as long instead of int.
Modified:
tomcat/trunk/java/org/apache/catalina/Manager.java
tomcat/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml
tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java
tomcat/trunk/java/org/apache/catalina/session/StandardSession.java
tomcat/trunk/java/org/apache/catalina/session/mbeans-descriptors.xml
Modified: tomcat/trunk/java/org/apache/catalina/Manager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Manager.java?rev=934337&r1=934336&r2=934337&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/Manager.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Manager.java Thu Apr 15 09:19:02 2010
@@ -127,7 +127,7 @@ public interface Manager {
*
* @return Total number of sessions created by this manager.
*/
- public int getSessionCounter();
+ public long getSessionCounter();
/**
@@ -135,7 +135,7 @@ public interface Manager {
*
* @param sessionCounter Total number of sessions created by this manager.
*/
- public void setSessionCounter(int sessionCounter);
+ public void setSessionCounter(long sessionCounter);
/**
@@ -171,7 +171,7 @@ public interface Manager {
*
* @return Number of sessions that have expired
*/
- public int getExpiredSessions();
+ public long getExpiredSessions();
/**
@@ -179,7 +179,7 @@ public interface Manager {
*
* @param expiredSessions Number of sessions that have expired
*/
- public void setExpiredSessions(int expiredSessions);
+ public void setExpiredSessions(long expiredSessions);
/**
Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml?rev=934337&r1=934336&r2=934337&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml Thu
Apr 15 09:19:02 2010
@@ -143,7 +143,7 @@ created by this Manager"
<attribute
name="sessionCounter"
description="Total number of sessions created by this manager"
- type="int"/>
+ type="long"/>
<attribute
name="sessionReplaceCounter"
description="Total number of replaced sessions that load from external
nodes"
@@ -172,7 +172,7 @@ created by this Manager"
<attribute
name="expiredSessions"
description="Number of sessions that expired ( doesn't include explicit
invalidations )"
- type="int"/>
+ type="long"/>
<attribute
name="stateTransferTimeout"
description="state transfer timeout in sec"
@@ -498,7 +498,7 @@ created by this Manager"
<attribute
name="sessionCounter"
description="Total number of sessions created by this manager"
- type="int"/>
+ type="long"/>
<attribute
name="maxActive"
description="Maximum number of active sessions so far"
@@ -518,7 +518,7 @@ created by this Manager"
<attribute
name="expiredSessions"
description="Number of sessions that expired ( doesn't include explicit
invalidations )"
- type="int"/>
+ type="long"/>
<attribute
name="processingTime"
description="Time spent doing housekeeping and expiration"
Modified: tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java?rev=934337&r1=934336&r2=934337&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java Thu Apr 15
09:19:02 2010
@@ -171,7 +171,7 @@ public abstract class ManagerBase extend
/**
* Number of sessions that have expired.
*/
- protected int expiredSessions = 0;
+ protected long expiredSessions = 0;
/**
@@ -181,7 +181,7 @@ public abstract class ManagerBase extend
protected Map<String, Session> sessions = new ConcurrentHashMap<String,
Session>();
// Number of sessions created by this manager
- protected int sessionCounter=0;
+ protected long sessionCounter=0;
protected volatile int maxActive=0;
@@ -626,7 +626,7 @@ public abstract class ManagerBase extend
*
* @return Number of sessions that have expired
*/
- public int getExpiredSessions() {
+ public long getExpiredSessions() {
return expiredSessions;
}
@@ -636,7 +636,7 @@ public abstract class ManagerBase extend
*
* @param expiredSessions Number of sessions that have expired
*/
- public void setExpiredSessions(int expiredSessions) {
+ public void setExpiredSessions(long expiredSessions) {
this.expiredSessions = expiredSessions;
}
@@ -1035,7 +1035,7 @@ public abstract class ManagerBase extend
// -------------------------------------------------------- Package Methods
- public void setSessionCounter(int sessionCounter) {
+ public void setSessionCounter(long sessionCounter) {
this.sessionCounter = sessionCounter;
}
@@ -1045,7 +1045,7 @@ public abstract class ManagerBase extend
*
* @return sessions created
*/
- public int getSessionCounter() {
+ public long getSessionCounter() {
return sessionCounter;
}
Modified: tomcat/trunk/java/org/apache/catalina/session/StandardSession.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/StandardSession.java?rev=934337&r1=934336&r2=934337&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/session/StandardSession.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/session/StandardSession.java Thu Apr
15 09:19:02 2010
@@ -793,11 +793,11 @@ public class StandardSession
if (timeAlive > manager.getSessionMaxAliveTime()) {
manager.setSessionMaxAliveTime(timeAlive);
}
- int numExpired = manager.getExpiredSessions();
+ long numExpired = manager.getExpiredSessions();
numExpired++;
manager.setExpiredSessions(numExpired);
int average = manager.getSessionAverageAliveTime();
- average = ((average * (numExpired-1)) + timeAlive)/numExpired;
+ average = (int) (((average * (numExpired-1)) +
timeAlive)/numExpired);
manager.setSessionAverageAliveTime(average);
}
Modified: tomcat/trunk/java/org/apache/catalina/session/mbeans-descriptors.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/mbeans-descriptors.xml?rev=934337&r1=934336&r2=934337&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/session/mbeans-descriptors.xml
(original)
+++ tomcat/trunk/java/org/apache/catalina/session/mbeans-descriptors.xml Thu
Apr 15 09:19:02 2010
@@ -85,7 +85,7 @@
<attribute name="sessionCounter"
description="Total number of sessions created by this manager"
- type="int" />
+ type="long" />
<attribute name="maxActive"
description="Maximum number of active sessions so far"
@@ -105,7 +105,7 @@
<attribute name="expiredSessions"
description="Number of sessions that expired ( doesn't include
explicit invalidations )"
- type="int" />
+ type="long" />
<attribute name="processingTime"
description="Time spent doing housekeeping and expiration"
@@ -247,7 +247,7 @@
<attribute name="sessionCounter"
description="Total number of sessions created by this manager"
- type="int" />
+ type="long" />
<attribute name="maxActive"
description="Maximum number of active sessions so far"
@@ -279,7 +279,7 @@
<attribute name="expiredSessions"
description="Number of sessions that expired ( doesn't include
explicit invalidations )"
- type="int" />
+ type="long" />
<attribute name="processingTime"
description="Time spent doing housekeeping and expiration"
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
