From 2105157ee855578e57b66e85f44b8d4034ad99a2 Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 29 Jul 2010 11:10:00 +0000
Subject: [PATCH] Rejected session count should not be writable

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@980401 13f79535-47bb-0310-9956-ffa450edef68
---
 java/org/apache/catalina/Manager.java                       | 9 ---------
 java/org/apache/catalina/ha/session/DeltaManager.java       | 4 ----
 java/org/apache/catalina/ha/session/mbeans-descriptors.xml  | 3 ++-
 java/org/apache/catalina/session/PersistentManagerBase.java | 4 ----
 java/org/apache/catalina/session/StandardManager.java       | 5 -----
 java/org/apache/catalina/session/mbeans-descriptors.xml     | 6 ++++--
 6 files changed, 6 insertions(+), 25 deletions(-)

diff --git a/java/org/apache/catalina/Manager.java b/java/org/apache/catalina/Manager.java
index deed104ea..0a340134a 100644
--- a/java/org/apache/catalina/Manager.java
+++ b/java/org/apache/catalina/Manager.java
@@ -192,15 +192,6 @@ public interface Manager {
 
 
     /**
-     * Sets the number of sessions that were not created because the maximum
-     * number of active sessions was reached.
-     *
-     * @param rejectedSessions Number of rejected sessions
-     */
-    public void setRejectedSessions(int rejectedSessions);
-
-
-    /**
      * Gets the longest time (in seconds) that an expired session had been
      * alive.
      *
diff --git a/java/org/apache/catalina/ha/session/DeltaManager.java b/java/org/apache/catalina/ha/session/DeltaManager.java
index 1d43573a1..d84f8cddf 100644
--- a/java/org/apache/catalina/ha/session/DeltaManager.java
+++ b/java/org/apache/catalina/ha/session/DeltaManager.java
@@ -307,10 +307,6 @@ public class DeltaManager extends ClusterManagerBase{
         return rejectedSessions;
     }
 
-    public void setRejectedSessions(int rejectedSessions) {
-        this.rejectedSessions = rejectedSessions;
-    }
-
     /**
      * @return Returns the counterNoStateTransfered.
      */
diff --git a/java/org/apache/catalina/ha/session/mbeans-descriptors.xml b/java/org/apache/catalina/ha/session/mbeans-descriptors.xml
index a4ecbf885..ba50f5224 100644
--- a/java/org/apache/catalina/ha/session/mbeans-descriptors.xml
+++ b/java/org/apache/catalina/ha/session/mbeans-descriptors.xml
@@ -309,7 +309,8 @@
     <attribute
       name="rejectedSessions"
       description="Number of sessions we rejected due to maxActive beeing reached"
-      type="int"/>
+      type="int"
+      writeable="false"/>
     <operation
       name="expireSession"
       description="Expired the given session"
diff --git a/java/org/apache/catalina/session/PersistentManagerBase.java b/java/org/apache/catalina/session/PersistentManagerBase.java
index 5e73ea689..3165936c8 100644
--- a/java/org/apache/catalina/session/PersistentManagerBase.java
+++ b/java/org/apache/catalina/session/PersistentManagerBase.java
@@ -409,10 +409,6 @@ public abstract class PersistentManagerBase extends ManagerBase
     }
 
     
-    public void setRejectedSessions(int rejectedSessions) {
-        this.rejectedSessions = rejectedSessions;
-    }
-
     /**
      * Return the descriptive short name of this Manager implementation.
      */
diff --git a/java/org/apache/catalina/session/StandardManager.java b/java/org/apache/catalina/session/StandardManager.java
index bb1c4d551..93f1c65b3 100644
--- a/java/org/apache/catalina/session/StandardManager.java
+++ b/java/org/apache/catalina/session/StandardManager.java
@@ -198,11 +198,6 @@ public class StandardManager extends ManagerBase
     }
 
 
-    public void setRejectedSessions(int rejectedSessions) {
-        this.rejectedSessions = rejectedSessions;
-    }
-
-
     /**
      * Set the maximum number of active Sessions allowed, or -1 for
      * no limit.
diff --git a/java/org/apache/catalina/session/mbeans-descriptors.xml b/java/org/apache/catalina/session/mbeans-descriptors.xml
index fa6e27cbe..f60340597 100644
--- a/java/org/apache/catalina/session/mbeans-descriptors.xml
+++ b/java/org/apache/catalina/session/mbeans-descriptors.xml
@@ -117,7 +117,8 @@
 
     <attribute   name="rejectedSessions"
           description="Number of sessions we rejected due to maxActive beeing reached"
-                 type="int" />
+                 type="int"
+            writeable="false"/>
                  
     <operation   name="backgroundProcess"
           description="Invalidate all sessions that have expired."
@@ -311,7 +312,8 @@
 
     <attribute   name="rejectedSessions"
           description="Number of sessions we rejected due to maxActive beeing reached"
-                 type="int" />
+                 type="int"
+            writeable="false"/>
 
     <operation   name="backgroundProcess"
           description="Invalidate all sessions that have expired."
-- 
2.11.0