Author: fhanik
Date: Tue Aug 7 12:02:25 2007
New Revision: 563625
URL: http://svn.apache.org/viewvc?view=rev&rev=563625
Log:
back port from trunk, bz http://issues.apache.org/bugzilla/show_bug.cgi?id=42530
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/ManagerBase.java
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/ManagerBase.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/ManagerBase.java?view=diff&rev=563625&r1=563624&r2=563625
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/ManagerBase.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/ManagerBase.java Tue
Aug 7 12:02:25 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]
