Return-Path: Delivered-To: apmail-jakarta-tomcat-dev-archive@www.apache.org Received: (qmail 45749 invoked from network); 13 Nov 2004 22:10:27 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 13 Nov 2004 22:10:27 -0000 Received: (qmail 45900 invoked by uid 500); 13 Nov 2004 22:10:17 -0000 Delivered-To: apmail-jakarta-tomcat-dev-archive@jakarta.apache.org Received: (qmail 45339 invoked by uid 500); 13 Nov 2004 22:10:11 -0000 Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Tomcat Developers List" Reply-To: "Tomcat Developers List" Delivered-To: mailing list tomcat-dev@jakarta.apache.org Received: (qmail 45323 invoked by uid 500); 13 Nov 2004 22:10:11 -0000 Received: (qmail 45320 invoked by uid 99); 13 Nov 2004 22:10:11 -0000 X-ASF-Spam-Status: No, hits=-10.0 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Sat, 13 Nov 2004 14:10:11 -0800 Received: (qmail 45463 invoked by uid 1923); 13 Nov 2004 22:10:10 -0000 Date: 13 Nov 2004 22:10:10 -0000 Message-ID: <20041113221010.45462.qmail@minotaur.apache.org> From: pero@apache.org To: jakarta-tomcat-catalina-cvs@apache.org Subject: cvs commit: jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session DeltaManager.java SimpleTcpReplicationManager.java X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N 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: tomcat-dev-unsubscribe@jakarta.apache.org For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org