Author: rjung
Date: Fri Jun 18 23:18:18 2010
New Revision: 956148
URL: http://svn.apache.org/viewvc?rev=956148&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49170
Do not send duplicated session.
Backport of r936777 (trunk), r942701 (TC6) and
r942703 (TC 5.5).
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaManager.java
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaManager.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaManager.java?rev=956148&r1=956147&r2=956148&view=diff
==============================================================================
---
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaManager.java
(original)
+++
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaManager.java
Fri Jun 18 23:18:18 2010
@@ -1601,10 +1601,9 @@ public class DeltaManager extends Cluste
sendSessions(sender, currentSessions, findSessionTimestamp);
} else {
// send session at blocks
- int len = currentSessions.length < getSendAllSessionsSize() ?
currentSessions.length : getSendAllSessionsSize();
- Session[] sendSessions = new Session[len];
for (int i = 0; i < currentSessions.length; i +=
getSendAllSessionsSize()) {
- len = i + getSendAllSessionsSize() > currentSessions.length ?
currentSessions.length - i : getSendAllSessionsSize();
+ int len = i + getSendAllSessionsSize() >
currentSessions.length ? currentSessions.length - i : getSendAllSessionsSize();
+ Session[] sendSessions = new Session[len];
System.arraycopy(currentSessions, i, sendSessions, 0, len);
sendSessions(sender, sendSessions,findSessionTimestamp);
if (getSendAllSessionsWaitTime() > 0) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
