From b023de5da0d1fa5bb9604036e7105079d069e6be Mon Sep 17 00:00:00 2001 From: remm Date: Mon, 28 May 2007 10:06:31 +0000 Subject: [PATCH] - Redo findSessions which was outdated (42530 claims concurrency problems that I can't reproduce). git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@542185 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/catalina/session/ManagerBase.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/java/org/apache/catalina/session/ManagerBase.java b/java/org/apache/catalina/session/ManagerBase.java index ced391a7d..7ec2fa6f5 100644 --- a/java/org/apache/catalina/session/ManagerBase.java +++ b/java/org/apache/catalina/session/ManagerBase.java @@ -175,7 +175,7 @@ public abstract class ManagerBase implements Manager, MBeanRegistration { * The set of currently active Sessions for this Manager, keyed by * session identifier. */ - protected Map sessions = new ConcurrentHashMap(); + protected Map sessions = new ConcurrentHashMap(); // Number of sessions created by this manager protected int sessionCounter=0; @@ -870,12 +870,7 @@ public abstract class ManagerBase implements Manager, MBeanRegistration { */ public Session[] findSessions() { - Session results[] = null; - synchronized (sessions) { - results = new Session[sessions.size()]; - results = (Session[]) sessions.values().toArray(results); - } - return (results); + return sessions.values().toArray(new Session[0]); } -- 2.11.0