Author: remm
Date: Mon May 28 03:06:31 2007
New Revision: 542185
URL: http://svn.apache.org/viewvc?view=rev&rev=542185
Log:
- Redo findSessions which was outdated (42530 claims concurrency problems that
I can't reproduce).
Modified:
tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java
Modified: tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java?view=diff&rev=542185&r1=542184&r2=542185
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java Mon May 28
03:06:31 2007
@@ -175,7 +175,7 @@
* The set of currently active Sessions for this Manager, keyed by
* session identifier.
*/
- protected Map sessions = new ConcurrentHashMap();
+ protected Map<String, Session> sessions = new ConcurrentHashMap<String,
Session>();
// Number of sessions created by this manager
protected int sessionCounter=0;
@@ -870,12 +870,7 @@
*/
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]);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
