Author: mmillson
Date: 2010-09-28 22:10:17 -0400 (Tue, 28 Sep 2010)
New Revision: 1557
Modified:
branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/catalina/session/ManagerBase.java
Log:
Backport Tomcat Bug 42530: ManagerBase.backgroundProcess throws NullPointerException for
[JBPAPP-4909].
Modified:
branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/catalina/session/ManagerBase.java
===================================================================
---
branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/catalina/session/ManagerBase.java 2010-09-21
15:03:19 UTC (rev 1556)
+++
branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/catalina/session/ManagerBase.java 2010-09-29
02:10:17 UTC (rev 1557)
@@ -176,7 +176,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;
@@ -869,12 +869,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]);
}
Show replies by date