billbarker 2002/12/30 19:48:08 Modified: catalina/src/share/org/apache/catalina/session ManagerBase.java Log: Port patch from Tomcat 4. Revision Changes Path 1.9 +16 -9 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.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- ManagerBase.java 30 Dec 2002 02:40:04 -0000 1.8 +++ ManagerBase.java 31 Dec 2002 03:48:08 -0000 1.9 @@ -633,16 +633,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]>