Author: rjung
Date: Mon Jan 31 19:42:18 2011
New Revision: 1065726
URL: http://svn.apache.org/viewvc?rev=1065726&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50547.
Add time stamp for CHANGE_SESSION_ID and SESSION_EXPIRED message.
Backport of r1055798 from trunk, resp. r1056216 from TC6,
resp. r1061471 form 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=1065726&r1=1065725&r2=1065726&view=diff
==============================================================================
--- tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml (original)
+++ tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml Mon Jan 31 19:42:18 2011
@@ -32,10 +32,14 @@
<section name="Tomcat OACC 0.1 (rjung)">
<subsection name="Cluster">
<fix>
+ <bug>50547</bug>: Add time stamp for CHANGE_SESSION_ID message and
+ SESSION_EXPIRED message. (rjung)
+ </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)
+ (rjung)
</fix>
<fix>
Fix broken unit tests. (rjung)
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=1065726&r1=1065725&r2=1065726&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:42:18 2011
@@ -677,6 +677,7 @@ public class DeltaManager extends Cluste
SessionMessage.EVT_CHANGE_SESSION_ID, data,
orgSessionID, orgSessionID + "-"
+ System.currentTimeMillis());
+ msg.setTimestamp(System.currentTimeMillis());
counterSend_EVT_CHANGE_SESSION_ID++;
send(msg);
} catch (IOException e) {
@@ -1418,6 +1419,7 @@ public class DeltaManager extends Cluste
if (cluster != null && cluster.getMembers().length > 0) {
counterSend_EVT_SESSION_EXPIRED++ ;
SessionMessage msg = new
SessionMessageImpl(getName(),SessionMessage.EVT_SESSION_EXPIRED, null, id, id+
"-EXPIRED-MSG");
+ msg.setTimestamp(System.currentTimeMillis());
if (log.isDebugEnabled())
log.debug(sm.getString("deltaManager.createMessage.expire",getName(), id));
send(msg);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
