Author: kfujino
Date: Fri Oct 29 05:22:16 2010
New Revision: 1028618
URL: http://svn.apache.org/viewvc?rev=1028618&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/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=1028618&r1=1028617&r2=1028618&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Fri Oct 29 05:22:16 2010
@@ -70,13 +70,6 @@ PATCHES PROPOSED TO BACKPORT:
, but moving to 6.0 is a decent soln.
Probably not worth changing this late in the evolution of 5.5.
-* 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, markt, rjung
- -1:
-
* Update Commons daemon to 1.0.4
Version 1.0.4 is bug fixing release. (Patch is trivial changing the version
number to 1.0.4 in build.properties.default, so not provided)
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=1028618&r1=1028617&r2=1028618&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
Fri Oct 29 05:22:16 2010
@@ -1452,8 +1452,8 @@ public class DeltaManager extends Manage
long replDelta = System.currentTimeMillis()
- session.getLastTimeReplicated();
if (replDelta >= updateActiveInterval*1000 ||
- (getMaxInactiveInterval()>=0 &&
- replDelta >= getMaxInactiveInterval()*1000)) {
+ (session.getMaxInactiveInterval()>=0 &&
+ replDelta >= session.getMaxInactiveInterval()*1000)) {
counterSend_EVT_SESSION_ACCESSED++;
msg = new SessionMessageImpl(getName(),
SessionMessage.EVT_SESSION_ACCESSED, null,
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=1028618&r1=1028617&r2=1028618&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
Fri Oct 29 05:22:16 2010
@@ -1232,7 +1232,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/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=1028618&r1=1028617&r2=1028618&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original)
+++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Fri Oct 29
05:22:16 2010
@@ -65,6 +65,16 @@
</fix>
</changelog>
</subsection>
+ <subsection name="Cluster">
+ <changelog>
+ <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>
</section>
<section name="Tomcat 5.5.31 (jim)" rtext="released 2010-09-16">
<subsection name="General">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
