sessionCounter and expiredSessions declares as long instead of int.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@934337 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/Manager.java b/java/org/apache/catalina/Manager.java
index 9689528..450c6f4 100644 (file)
--- a/java/org/apache/catalina/Manager.java
+++ b/java/org/apache/catalina/Manager.java
@@ -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);
 
 
     /**

diff --git a/java/org/apache/catalina/ha/session/mbeans-descriptors.xml b/java/org/apache/catalina/ha/session/mbeans-descriptors.xml
index 4da1d84..8035f48 100644 (file)
--- a/java/org/apache/catalina/ha/session/mbeans-descriptors.xml
+++ b/java/org/apache/catalina/ha/session/mbeans-descriptors.xml
@@ -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"

diff --git a/java/org/apache/catalina/session/ManagerBase.java b/java/org/apache/catalina/session/ManagerBase.java
index aa6c9e8..6b19790 100644 (file)
--- a/java/org/apache/catalina/session/ManagerBase.java
+++ b/java/org/apache/catalina/session/ManagerBase.java
@@ -171,7 +171,7 @@ public abstract class ManagerBase extends LifecycleBase
     /**
      * Number of sessions that have expired.
      */
-    protected int expiredSessions = 0;
+    protected long expiredSessions = 0;
 
 
     /**
@@ -181,7 +181,7 @@ public abstract class ManagerBase extends LifecycleBase
     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 extends LifecycleBase
      *
      * @return Number of sessions that have expired
      */
-    public int getExpiredSessions() {
+    public long getExpiredSessions() {
         return expiredSessions;
     }
 
@@ -636,7 +636,7 @@ public abstract class ManagerBase extends LifecycleBase
      *
      * @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 extends LifecycleBase
     // -------------------------------------------------------- Package Methods
 
 
-    public void setSessionCounter(int sessionCounter) {
+    public void setSessionCounter(long sessionCounter) {
         this.sessionCounter = sessionCounter;
     }
 
@@ -1045,7 +1045,7 @@ public abstract class ManagerBase extends LifecycleBase
      *
      * @return sessions created
      */
-    public int getSessionCounter() {
+    public long getSessionCounter() {
         return sessionCounter;
     }
 

diff --git a/java/org/apache/catalina/session/StandardSession.java b/java/org/apache/catalina/session/StandardSession.java
index 03e21fd..d39fce4 100644 (file)
--- a/java/org/apache/catalina/session/StandardSession.java
+++ b/java/org/apache/catalina/session/StandardSession.java
@@ -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);
             }
 

diff --git a/java/org/apache/catalina/session/mbeans-descriptors.xml b/java/org/apache/catalina/session/mbeans-descriptors.xml
index a4f049a..67e81f1 100644 (file)
--- a/java/org/apache/catalina/session/mbeans-descriptors.xml
+++ b/java/org/apache/catalina/session/mbeans-descriptors.xml
@@ -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"