Author: kfujino
Date: Fri Oct 29 02:53:53 2010
New Revision: 1028592
URL: http://svn.apache.org/viewvc?rev=1028592&view=rev
Log:
Improve sending an access message in DeltaManager.
maxInactiveInterval of not Manager but the session is used.
If maxInactiveInterval is negative, an access message is not sending.
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=1028592&r1=1028591&r2=1028592&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Oct 29 02:53:53 2010
@@ -225,17 +225,6 @@ PATCHES PROPOSED TO BACKPORT:
+1: kkolinko, rjung
-1:
-* Improve sending an access message in DeltaManager.
- maxInactiveInterval of not Manager but the session is used.
- If maxInactiveInterval is negative, an access message is not sending.
- http://svn.apache.org/viewvc?rev=1025924&view=rev
- +1: kfujino, rjung
- +1: markt - At first I wondered what the purpose of this code is but on
closer
- inspection DeltaSessions on non-primary nodes are expired at
- 2*getMaxInactiveInterval() rather than getMaxInactiveInterval()
so
- this makes sense.
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50140
Don't ignore user specified installation directory on 64-bit platforms
Allow 32-bit and 64-bit JDKs to be selected on 64-bit platforms
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=1028592&r1=1028591&r2=1028592&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
Fri Oct 29 02:53:53 2010
@@ -1250,7 +1250,8 @@ public class DeltaManager extends Cluste
//check to see if we need to send out an access message
if (!expires && (msg == null)) {
long replDelta = System.currentTimeMillis() -
session.getLastTimeReplicated();
- if (replDelta > (getMaxInactiveInterval() * 1000)) {
+ if (session.getMaxInactiveInterval() >=0 &&
+ replDelta > (session.getMaxInactiveInterval() * 1000))
{
counterSend_EVT_SESSION_ACCESSED++;
msg = new SessionMessageImpl(getName(),
SessionMessage.EVT_SESSION_ACCESSED,
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=1028592&r1=1028591&r2=1028592&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Fri Oct 29 02:53:53 2010
@@ -237,6 +237,12 @@
<fix>
Add support for maxActiveSessions attribute to BackupManager. (kfujino)
</fix>
+ <fix>
+ Improve sending an access message in DeltaManager.
+ maxInactiveInterval of not Manager but the session is used.
+ If maxInactiveInterval is negative, an access message is not sending.
+ (kfujino)
+ </fix>
</changelog>
</subsection>
<subsection name="Webapps">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
