billbarker 2002/12/29 18:40:04
Modified: catalina/src/share/org/apache/catalina/session
ManagerBase.java
Log:
Port from Tomcat 4 branch.
Revision Changes Path
1.8 +10 -10
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/session/ManagerBase.java
Index: ManagerBase.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/session/ManagerBase.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ManagerBase.java 13 Dec 2002 21:50:21 -0000 1.7
+++ ManagerBase.java 30 Dec 2002 02:40:04 -0000 1.8
@@ -632,17 +632,17 @@
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;
}
- /*
- 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]>
