Author: rjung
Date: Mon Jan 31 19:34:57 2011
New Revision: 1065723
URL: http://svn.apache.org/viewvc?rev=1065723&view=rev
Log:
Improve sending an access message in DeltaManager.
maxInactiveInterval of the session is used instead of
maxInactiveInterval of the manager.
If maxInactiveInterval is negative, an access message is not send.
Backport of r1025924 from trunk, resp. r1028592 from TC6,
resp r1028618 from TC5.5.
Modified:
tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaManager.java
Modified: tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml?rev=1065723&r1=1065722&r2=1065723&view=diff
==============================================================================
--- tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml (original)
+++ tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml Mon Jan 31 19:34:57 2011
@@ -32,6 +32,12 @@
<section name="Tomcat OACC 0.1 (rjung)">
<subsection name="Cluster">
<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>
+ <fix>
Fix broken unit tests. (rjung)
</fix>
<fix>
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=1065723&r1=1065722&r2=1065723&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
Mon Jan 31 19:34:57 2011
@@ -1336,8 +1336,8 @@ public class DeltaManager extends Cluste
if (!expires && (msg == null)) {
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,
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
