billbarker 2002/12/29 18:36:26
Modified: catalina/src/share/org/apache/catalina/session
ManagerBase.java
Log:
Re-enable the unique session-id logic.
Submitted By: Tim Funk [EMAIL PROTECTED]
Revision Changes Path
1.15 +10 -10
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/ManagerBase.java
Index: ManagerBase.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/ManagerBase.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ManagerBase.java 10 Dec 2002 13:33:22 -0000 1.14
+++ ManagerBase.java 30 Dec 2002 02:36:26 -0000 1.15
@@ -579,18 +579,18 @@
session.setCreationTime(System.currentTimeMillis());
session.setMaxInactiveInterval(this.maxInactiveInterval);
String sessionId = generateSessionId();
+
+ synchronized (sessions) {
+ while (sessions.get(sessionId) != null) // Guarantee uniqueness
+ sessionId = generateSessionId();
+ }
+
String jvmRoute = getJvmRoute();
// @todo Move appending of jvmRoute generateSessionId()???
if (jvmRoute != null) {
sessionId += '.' + jvmRoute;
session.setId(sessionId);
}
- /*
- synchronized (sessions) {
- while (sessions.get(sessionId) != null) // Guarantee uniqueness
- sessionId = generateSessionId();
- }
- */
session.setId(sessionId);
return (session);
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
