This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 56fc7a8f40 Remove deprecated items
56fc7a8f40 is described below
commit 56fc7a8f40490cb4d1cc32bc3be74d9415b78613
Author: remm <r...@apache.org>
AuthorDate: Fri Apr 12 09:21:06 2024 +0200
Remove deprecated items
---
java/org/apache/catalina/Manager.java | 10 ------
java/org/apache/catalina/session/ManagerBase.java | 43 -----------------------
2 files changed, 53 deletions(-)
diff --git a/java/org/apache/catalina/Manager.java
b/java/org/apache/catalina/Manager.java
index b8438b1150..ed52490b33 100644
--- a/java/org/apache/catalina/Manager.java
+++ b/java/org/apache/catalina/Manager.java
@@ -85,16 +85,6 @@ public interface Manager {
long getSessionCounter();
- /**
- * Sets the total number of sessions created by this manager.
- *
- * @param sessionCounter Total number of sessions created by this manager.
- * @deprecated This will be removed in Tomcat 11
- */
- @Deprecated
- void setSessionCounter(long sessionCounter);
-
-
/**
* Gets the maximum number of sessions that have been active at the same
* time.
diff --git a/java/org/apache/catalina/session/ManagerBase.java
b/java/org/apache/catalina/session/ManagerBase.java
index 68bb0195d7..54845485ae 100644
--- a/java/org/apache/catalina/session/ManagerBase.java
+++ b/java/org/apache/catalina/session/ManagerBase.java
@@ -127,13 +127,6 @@ public abstract class ManagerBase extends
LifecycleMBeanBase implements Manager
*/
protected Map<String,Session> sessions = new ConcurrentHashMap<>();
- /**
- * Number of sessions created by this manager.
- * @deprecated This will be removed in Tomcat 11
- */
- @Deprecated
- protected long sessionCounter = 0;
-
protected volatile int maxActive = 0;
private final Object maxActiveUpdateLock = new Object();
@@ -148,13 +141,6 @@ public abstract class ManagerBase extends
LifecycleMBeanBase implements Manager
*/
protected int rejectedSessions = 0;
- /**
- * Number of duplicated session ids, anything > 0 means we have problems.
- * @deprecated This will be removed in Tomcat 11
- */
- @Deprecated
- protected volatile int duplicates = 0;
-
/**
* Processing time during session expiration.
*/
@@ -892,41 +878,12 @@ public abstract class ManagerBase extends
LifecycleMBeanBase implements Manager
// -------------------------------------------------------- Package Methods
- @Override
- public void setSessionCounter(long sessionCounter) {
- this.sessionCounter = sessionCounter;
- }
-
-
@Override
public long getSessionCounter() {
return getActiveSessions() + getExpiredSessions();
}
- /**
- * Number of duplicated session IDs generated by the random source.
Anything bigger than 0 means problems.
- *
- * @return The count of duplicates
- * @deprecated This will be removed in Tomcat 11
- */
- @Deprecated
- public int getDuplicates() {
- return duplicates;
- }
-
-
- /**
- * Set duplicates count.
- * @param duplicates the new duplicates count
- * @deprecated This will be removed in Tomcat 11
- */
- @Deprecated
- public void setDuplicates(int duplicates) {
- this.duplicates = duplicates;
- }
-
-
@Override
public int getActiveSessions() {
return sessions.size();
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
