This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.0.x by this push:
new 98a6911568 Refactor to avoid use of Hashtable. No functional change.
98a6911568 is described below
commit 98a6911568be500d357937c66ee7860ac37179a1
Author: Mark Thomas <[email protected]>
AuthorDate: Wed Sep 14 19:22:43 2022 +0100
Refactor to avoid use of Hashtable. No functional change.
---
java/org/apache/catalina/ha/session/DeltaSession.java | 3 +--
java/org/apache/catalina/session/StandardSession.java | 5 ++---
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/java/org/apache/catalina/ha/session/DeltaSession.java
b/java/org/apache/catalina/ha/session/DeltaSession.java
index 21d411936d..94fd89257e 100644
--- a/java/org/apache/catalina/ha/session/DeltaSession.java
+++ b/java/org/apache/catalina/ha/session/DeltaSession.java
@@ -27,7 +27,6 @@ import java.io.Serializable;
import java.io.WriteAbortedException;
import java.security.Principal;
import java.util.ArrayList;
-import java.util.Hashtable;
import java.util.List;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicInteger;
@@ -959,7 +958,7 @@ public class DeltaSession extends StandardSession
implements Externalizable,Clus
}
if (notes == null) {
- notes = new Hashtable<>();
+ notes = new ConcurrentHashMap<>();
}
activate();
}
diff --git a/java/org/apache/catalina/session/StandardSession.java
b/java/org/apache/catalina/session/StandardSession.java
index 439f71bb41..a71a340a8e 100644
--- a/java/org/apache/catalina/session/StandardSession.java
+++ b/java/org/apache/catalina/session/StandardSession.java
@@ -31,7 +31,6 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.Enumeration;
import java.util.HashSet;
-import java.util.Hashtable;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -206,7 +205,7 @@ public class StandardSession implements HttpSession,
Session, Serializable {
* and event listeners. <b>IMPLEMENTATION NOTE:</b> This object is
* <em>not</em> saved and restored across session serializations!
*/
- protected transient Map<String, Object> notes = new Hashtable<>();
+ protected transient Map<String, Object> notes = new ConcurrentHashMap<>();
/**
@@ -1567,7 +1566,7 @@ public class StandardSession implements HttpSession,
Session, Serializable {
}
if (notes == null) {
- notes = new Hashtable<>();
+ notes = new ConcurrentHashMap<>();
}
/*
* The next object read could either be the number of attributes
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
