billbarker 2002/12/30 19:45:48
Modified: catalina/src/share/org/apache/catalina/session
ManagerBase.java
Log:
Make certain that the jvmRoute is attached to the session before comparing for
uniqueness.
Submitted by: Glenn Olander [EMAIL PROTECTED]
Revision Changes Path
1.16 +15 -9
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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ManagerBase.java 30 Dec 2002 02:36:26 -0000 1.15
+++ ManagerBase.java 31 Dec 2002 03:45:48 -0000 1.16
@@ -580,17 +580,23 @@
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();
+ // @todo Move appending of jvmRoute generateSessionId()???
+ if (jvmRoute != null) {
+ sessionId += '.' + jvmRoute;
+ session.setId(sessionId);
+ }
+ }
+ }
+
session.setId(sessionId);
return (session);
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
