tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fha...@apache.org
Subject svn commit: r811096 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/ha/session/DeltaManager.java webapps/docs/changelog.xml
Date Thu, 03 Sep 2009 19:52:16 GMT
Author: fhanik
Date: Thu Sep  3 19:52:15 2009
New Revision: 811096

URL: http://svn.apache.org/viewvc?rev=811096&view=rev
Log:
Deltamanager https://issues.apache.org/bugzilla/show_bug.cgi?id=47515
Patch by Ryuichi Yoshihara

Modified:
    tomcat/tc6.0.x/trunk/STATUS.txt
    tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
    tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=811096&r1=811095&r2=811096&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Sep  3 19:52:15 2009
@@ -132,11 +132,6 @@
     Is it still relevant? I do not see any waiting there.
   )
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47515
-  https://issues.apache.org/bugzilla/attachment.cgi?id=23973
-  +1: fhanik, kkolinko, markt,funkman
-  -1: 
-
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47413
   First part of a composite EL expression "${a}${b}" was not coerced to String
   Without coercion, the concatenation of ((Object)null) + string results in

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java?rev=811096&r1=811095&r2=811096&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java Thu Sep  3
19:52:15 2009
@@ -1162,7 +1162,10 @@
             }
 
             //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);

Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=811096&r1=811095&r2=811096&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu Sep  3 19:52:15 2009
@@ -206,6 +206,7 @@
   </subsection>
   <subsection name="Cluster">
     <changelog>
+      <fix><bug>47515</bug>Correctly replicate timestamp during startup</fix>
       <fix><bug>47478</bug>Call replication listeners when using BackupManager</fix>
       <fix>
         <bug>47369</bug>: Reset data diff after replication



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message