From 8ec8e2dbc39cea6ff1da72db2e5c469343ac742d Mon Sep 17 00:00:00 2001 From: rjung Date: Wed, 9 Mar 2011 17:09:50 +0000 Subject: [PATCH] Session attributes were only partially changed from Hashtable to ConcurrentHashMap. git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1079891 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/catalina/ha/session/DeltaSession.java | 3 ++- java/org/apache/catalina/session/StandardSession.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/java/org/apache/catalina/ha/session/DeltaSession.java b/java/org/apache/catalina/ha/session/DeltaSession.java index 161e7848f..6ec35eeb7 100644 --- a/java/org/apache/catalina/ha/session/DeltaSession.java +++ b/java/org/apache/catalina/ha/session/DeltaSession.java @@ -28,6 +28,7 @@ import java.io.Serializable; import java.security.Principal; import java.util.ArrayList; import java.util.Hashtable; +import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantReadWriteLock; @@ -674,7 +675,7 @@ public class DeltaSession extends StandardSession implements Externalizable,Clus if (log.isDebugEnabled()) log.debug(sm.getString("deltaSession.readSession", id)); // Deserialize the attribute count and attribute values - if (attributes == null) attributes = new Hashtable(); + if (attributes == null) attributes = new ConcurrentHashMap(); int n = ( (Integer) stream.readObject()).intValue(); boolean isValidSave = isValid; isValid = true; diff --git a/java/org/apache/catalina/session/StandardSession.java b/java/org/apache/catalina/session/StandardSession.java index 72063b7c5..a418ce57e 100644 --- a/java/org/apache/catalina/session/StandardSession.java +++ b/java/org/apache/catalina/session/StandardSession.java @@ -1578,7 +1578,7 @@ public class StandardSession implements HttpSession, Session, Serializable { // Deserialize the attribute count and attribute values if (attributes == null) - attributes = new Hashtable(); + attributes = new ConcurrentHashMap(); int n = ((Integer) stream.readObject()).intValue(); boolean isValidSave = isValid; isValid = true; -- 2.11.0