From 69287d987d7c9098b4fb42ab919792c83cdb553a Mon Sep 17 00:00:00 2001
From: kfujino <kfujino@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 6 Jan 2011 09:17:28 +0000
Subject: [PATCH] Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50547.
 Add time stamp for CHANGE_SESSION_ID and SESSION_EXPIRED message.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1055798 13f79535-47bb-0310-9956-ffa450edef68
---
 java/org/apache/catalina/ha/session/DeltaManager.java | 2 ++
 webapps/docs/changelog.xml                            | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/java/org/apache/catalina/ha/session/DeltaManager.java b/java/org/apache/catalina/ha/session/DeltaManager.java
index 460399660..8afea3818 100644
--- a/java/org/apache/catalina/ha/session/DeltaManager.java
+++ b/java/org/apache/catalina/ha/session/DeltaManager.java
@@ -547,6 +547,7 @@ public CatalinaCluster getCluster() {
                         SessionMessage.EVT_CHANGE_SESSION_ID, data,
                         orgSessionID, orgSessionID + "-"
                                 + System.currentTimeMillis());
+                msg.setTimestamp(System.currentTimeMillis());
                 counterSend_EVT_CHANGE_SESSION_ID++;
                 send(msg);
             } catch (IOException e) {
@@ -1164,6 +1165,7 @@ public CatalinaCluster getCluster() {
     protected void sessionExpired(String id) {
         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);
     }
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index c304686f7..e83e3d688 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -245,6 +245,10 @@
         <bug>50503</bug>: When web application has a version, Engine level 
         Clustering works correctly. (kfujino)
       </fix>
+      <fix>
+        <bug>50547</bug>: Add time stamp for CHANGE_SESSION_ID message and 
+        SESSION_EXPIRED message. (kfujino)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Web applications">
-- 
2.11.0