quintonm 2003/01/16 16:12:54
Modified: src/java/org/apache/turbine/services/session
TurbineSession.java TurbineSessionService.java
SessionService.java
Log:
Added two new methods:
+ getUserFromSession(User):HttpSession
+ getSession(String):HttpSession
Revision Changes Path
1.2 +23 -1
jakarta-turbine-2/src/java/org/apache/turbine/services/session/TurbineSession.java
Index: TurbineSession.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/session/TurbineSession.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TurbineSession.java 6 Jan 2003 00:34:58 -0000 1.1
+++ TurbineSession.java 17 Jan 2003 00:12:54 -0000 1.2
@@ -143,4 +143,26 @@
.getInstance().getService(SessionService.SERVICE_NAME);
}
+ /**
+ * Gets the User object of the the specified HttpSession.
+ *
+ * @param session
+ * @return
+ */
+ public static User getUserFromSession(HttpSession session)
+ {
+ return getService().getUserFromSession(session);
+ }
+
+ /**
+ * Gets the HttpSession by the session identifier
+ *
+ * @param sessionId
+ * @return
+ */
+ public static HttpSession getSession(String sessionId)
+ {
+ return getService().getSession(sessionId);
+ }
+
}
1.3 +28 -9
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TurbineSessionService.java 13 Jan 2003 21:14:29 -0000 1.2
+++ TurbineSessionService.java 17 Jan 2003 00:12:54 -0000 1.3
@@ -60,6 +60,7 @@
import java.util.Map;
import java.util.Vector;
import javax.servlet.http.HttpSession;
+
import org.apache.turbine.om.security.User;
import org.apache.turbine.services.TurbineBaseService;
@@ -147,21 +148,39 @@
Vector users = new Vector();
// loop through the active sessions to find the user
- for (Iterator iter = activeSessions.values().iterator(); iter.hasNext();)
+ for(Iterator iter = activeSessions.values().iterator(); iter.hasNext();)
{
HttpSession session = (HttpSession) iter.next();
- Object attribute = session.getAttribute(User.SESSION_KEY);
- if (attribute != null)
+ User tmpUser = getUserFromSession(session);
+ if(tmpUser != null && tmpUser.hasLoggedIn())
{
- User tmpUser = (User) attribute;
- if (tmpUser.hasLoggedIn())
- {
- users.add(tmpUser);
- }
+ users.add(tmpUser);
}
}
return users;
+ }
+
+ /**
+ * Gets the User object of the the specified HttpSession.
+ *
+ * @param session
+ * @return
+ */
+ public User getUserFromSession(HttpSession session)
+ {
+ return (User) session.getAttribute(User.SESSION_KEY);
+ }
+
+ /**
+ * Gets the HttpSession by the session identifier
+ *
+ * @param sessionId
+ * @return
+ */
+ public HttpSession getSession(String sessionId)
+ {
+ return (HttpSession) this.activeSessions.get(sessionId);
}
/******************************************************
1.3 +17 -1
jakarta-turbine-2/src/java/org/apache/turbine/services/session/SessionService.java
Index: SessionService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/session/SessionService.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SessionService.java 11 Jan 2003 18:42:34 -0000 1.2
+++ SessionService.java 17 Jan 2003 00:12:54 -0000 1.3
@@ -122,4 +122,20 @@
*/
Collection getActiveUsers();
+ /**
+ * Gets the User object of the the specified HttpSession.
+ *
+ * @param session
+ * @return
+ */
+ public User getUserFromSession(HttpSession session);
+
+ /**
+ * Gets the HttpSession by the session identifier
+ *
+ * @param sessionId
+ * @return
+ */
+ public HttpSession getSession(String sessionId);
+
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
