Author: pero
Date: Wed Aug 1 06:59:00 2007
New Revision: 561799
URL: http://svn.apache.org/viewvc?view=rev&rev=561799
Log:
Ported from tomcat 6.0.x: Fix timeout setting on a replicated session.
Modified:
tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
Modified:
tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java?view=diff&rev=561799&r1=561798&r2=561799
==============================================================================
---
tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java
(original)
+++
tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java
Wed Aug 1 06:59:00 2007
@@ -1434,7 +1434,7 @@
counterSend_EVT_SESSION_EXPIRED++ ;
SessionMessage msg = new SessionMessageImpl(getName(),
SessionMessage.EVT_SESSION_EXPIRED, null, id, id
- + "-EXPIRED-MSG");
+ + "-EXPIRED-MSG");
if (log.isDebugEnabled())
log.debug(sm.getString("deltaManager.createMessage.expire",
getName(), id));
@@ -1664,6 +1664,8 @@
session.setValid(true);
session.setPrimarySession(false);
session.setCreationTime(msg.getTimestamp());
+ // use container maxInactiveInterval so that session will expire
correctly in case of primary transfer
+ session.setMaxInactiveInterval(getMaxInactiveInterval());
session.setExpireTolerance(this.expireTolerance);
session.access();
if(notifySessionListenersOnReplication)
Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?view=diff&rev=561799&r1=561798&r2=561799
==============================================================================
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Wed Aug 1 06:59:00 2007
@@ -103,7 +103,11 @@
<fix>
<bug>42689</bug>: No way to timeout new connect attempts for
replication sockets.
Patch by Casey Lucas (pero)
- </fix>
+ </fix>
+ <fix>
+ Fix timeout setting on a replicated DeltaSession.
+ Patch by Alexander Maas (fhanik,pero)
+ </fix>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
