dlr 2003/01/30 16:56:26
Modified: src/java/org/apache/turbine/services/session
TurbineSessionService.java
Log:
* src/java/org/apache/turbine/services/session/TurbineSessionService.java
getSessionsForUser(User): Rewrote to avoid unnecessary object
instantiation and duplicate interation introduced by my refactoring
of getActiveSessions() (had a merge conflict with Quinton).
Switched from using Vector to ArrayList for returning results
(reasoning as per my change to getActiveUsers() in CVS revision
1.5), and chose better variable name.
Replaced "Service initilization methods" marker with something that
JavaDoc won't get confused about.
Revision Changes Path
1.6 +13 -13
jakarta-turbine-2/src/java/org/apache/turbine/services/session/TurbineSessionService.java
Index: TurbineSessionService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/session/TurbineSessionService.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -u -r1.5 -r1.6
--- TurbineSessionService.java 31 Jan 2003 00:20:53 -0000 1.5
+++ TurbineSessionService.java 31 Jan 2003 00:56:26 -0000 1.6
@@ -205,25 +205,25 @@
*/
public Collection getSessionsForUser(User user)
{
- Vector results = new Vector();
- Collection sessions = this.getActiveSessions();
- for(Iterator iter = sessions.iterator(); iter.hasNext();)
+ Collection sessions = new ArrayList();
+ synchronized (activeSessions)
{
- HttpSession session = (HttpSession) iter.next();
- User tmpUser = this.getUserFromSession(session);
- if(user.equals(tmpUser))
+ for (Iterator i = activeSessions.values().iterator(); i.hasNext();)
{
- results.add(session);
+ HttpSession session = (HttpSession) i.next();
+ User u = this.getUserFromSession(session);
+ if (user.equals(u))
+ {
+ sessions.add(session);
+ }
}
-
}
- return results;
+ return sessions;
}
- /******************************************************
- * Service initilization methods
- *****************************************************/
+
+ // ---- Service initilization ------------------------------------------
/**
* Initializes the service
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
