Author: rjung
Date: Thu Apr 15 19:58:30 2010
New Revision: 934571
URL: http://svn.apache.org/viewvc?rev=934571&view=rev
Log:
BZ47515: Correctly replicate timestamp during startup.
Patch by Ryuichi Yoshihara
Backport of r811096 from TC 6.0.x.
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=934571&r1=934570&r2=934571&view=diff
==============================================================================
--- tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml (original)
+++ tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml Thu Apr 15 19:58:30 2010
@@ -31,6 +31,10 @@
<body>
<section name="Tomcat OACC 0.1 (rjung)">
<subsection name="Cluster">
+ <fix>
+ <bug>47515</bug>: Correctly replicate timestamp during startup.
+ Port from Tomcat 6.0. (rjung)
+ </fix>
<add>
<bug>45255</bug>: Add the ability to change session ID on
authentication to protect against session fixation attacks. This is
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=934571&r1=934570&r2=934571&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
Thu Apr 15 19:58:30 2010
@@ -1273,7 +1273,10 @@ public class DeltaManager extends Cluste
}
//update last replicated time
- if (msg != null)
session.setLastTimeReplicated(System.currentTimeMillis());
+ if (msg != null){
+ session.setLastTimeReplicated(System.currentTimeMillis());
+ msg.setTimestamp(session.getLastTimeReplicated());
+ }
return msg;
} catch (IOException x) {
log.error(sm.getString("deltaManager.createMessage.unableCreateDeltaRequest",sessionId),
x);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
