You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by kf...@apache.org on 2010/05/10 12:26:35 UTC
svn commit: r942703 - in /tomcat/tc5.5.x/trunk: ./
container/modules/cluster/src/share/org/apache/catalina/cluster/session/
container/modules/ha/src/share/org/apache/catalina/ha/session/
container/webapps/docs/
Author: kfujino
Date: Mon May 10 10:26:35 2010
New Revision: 942703
URL: http://svn.apache.org/viewvc?rev=942703&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49170
Do not send duplicated session.
Modified:
tomcat/tc5.5.x/trunk/STATUS.txt
tomcat/tc5.5.x/trunk/container/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java
tomcat/tc5.5.x/trunk/container/modules/ha/src/share/org/apache/catalina/ha/session/DeltaManager.java
tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=942703&r1=942702&r2=942703&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Mon May 10 10:26:35 2010
@@ -116,14 +116,6 @@ PATCHES PROPOSED TO BACKPORT:
http://svn.apache.org/viewvc?view=revision&revision=749019
-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
- +1: kkolinko, markt: to apply to the both DeltaManager classes in TC 5.5 (in
- o.a.c.ha.session and o.a.c.cluster.session packages)
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49236
Do not use indexing when packing Tomcat JARs.
https://issues.apache.org/bugzilla/attachment.cgi?id=25382
Modified: tomcat/tc5.5.x/trunk/container/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java
URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java?rev=942703&r1=942702&r2=942703&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/container/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java (original)
+++ tomcat/tc5.5.x/trunk/container/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java Mon May 10 10:26:35 2010
@@ -1741,13 +1741,9 @@ public class DeltaManager extends Manage
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/tc5.5.x/trunk/container/modules/ha/src/share/org/apache/catalina/ha/session/DeltaManager.java
URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/modules/ha/src/share/org/apache/catalina/ha/session/DeltaManager.java?rev=942703&r1=942702&r2=942703&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/container/modules/ha/src/share/org/apache/catalina/ha/session/DeltaManager.java (original)
+++ tomcat/tc5.5.x/trunk/container/modules/ha/src/share/org/apache/catalina/ha/session/DeltaManager.java Mon May 10 10:26:35 2010
@@ -1477,10 +1477,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/tc5.5.x/trunk/container/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml?rev=942703&r1=942702&r2=942703&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original)
+++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Mon May 10 10:26:35 2010
@@ -107,6 +107,13 @@
</fix>
</changelog>
</subsection>
+ <subsection name="Cluster">
+ <changelog>
+ <fix>
+ <bug>49170</bug>: Do not send duplicated session. (kfujino)
+ </fix>
+ </changelog>
+ </subsection>
<subsection name="Webapps">
<changelog>
<add>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org