pero 2004/11/13 14:10:10
Modified: modules/cluster/src/share/org/apache/catalina/cluster/session
DeltaManager.java SimpleTcpReplicationManager.java
Log:
DeltaManager and SimpleTcpReplicationManager generate double jvmRoutes
Revision Changes Path
1.35 +2 -11
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java
Index: DeltaManager.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- DeltaManager.java 19 Oct 2004 22:35:22 -0000 1.34
+++ DeltaManager.java 13 Nov 2004 22:10:10 -0000 1.35
@@ -308,20 +308,11 @@
DeltaSession session = getNewDeltaSession();
String 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
duplicates++;
sessionId = generateSessionId();
- // @todo Move appending of jvmRoute generateSessionId()???
- if (jvmRoute != null) {
- sessionId += '.' + jvmRoute;
- }
- }
+ }
}
session.setNew(true);
1.35 +0 -5
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/SimpleTcpReplicationManager.java
Index: SimpleTcpReplicationManager.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/SimpleTcpReplicationManager.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- SimpleTcpReplicationManager.java 20 Oct 2004 18:36:35 -0000 1.34
+++ SimpleTcpReplicationManager.java 13 Nov 2004 22:10:10 -0000 1.35
@@ -188,11 +188,6 @@
session.setCreationTime(System.currentTimeMillis());
session.setMaxInactiveInterval(this.maxInactiveInterval);
String sessionId = generateSessionId();
- String jvmRoute = getJvmRoute();
- // @todo Move appending of jvmRoute generateSessionId()???
- if (jvmRoute != null) {
- sessionId += '.' + jvmRoute;
- }
if ( setId ) session.setId(sessionId);
if ( notify && (cluster!=null) ) {
((ReplicatedSession)session).setIsDirty(true);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
