Author: kfujino
Date: Mon May 10 09:58:30 2010
New Revision: 942701
URL: http://svn.apache.org/viewvc?rev=942701&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49170
Do not send duplicated session.
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=942701&r1=942700&r2=942701&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon May 10 09:58:30 2010
@@ -257,12 +257,6 @@ PATCHES PROPOSED TO BACKPORT:
- If you are going to change the default, do it in the code
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49170
- Do not send duplicated session.
- http://svn.apache.org/viewvc?view=revision&revision=936777
- +1: kfujino, kkolinko, markt
- -1:
-
* Make the principal implement Serializable
http://svn.apache.org/viewvc?view=revision&revision=939491
+1: fhanik, markt, kkolinko
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java?rev=942701&r1=942700&r2=942701&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
Mon May 10 09:58:30 2010
@@ -1507,10 +1507,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) {
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=942701&r1=942700&r2=942701&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Mon May 10 09:58:30 2010
@@ -146,6 +146,9 @@
<bug>49151</bug>: Avoid ClassCastException in BackupManager#stop.
(kfujino)
</fix>
+ <fix>
+ <bug>49170</bug>: Do not send duplicated session. (kfujino)
+ </fix>
</changelog>
</subsection>
<subsection name="Webapps">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
