Author: jim
Date: Thu Jan 20 19:21:41 2011
New Revision: 1061471
URL: http://svn.apache.org/viewvc?rev=1061471&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.
http://svn.apache.org/viewvc?view=revision&revision=1055798
https://issues.apache.org/bugzilla/attachment.cgi?id=26482 (patch against
tc5.5)
+1: kfujino, markt, jim
-1:
Modified:
tomcat/tc5.5.x/trunk/STATUS.txt
tomcat/tc5.5.x/trunk/container/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java
tomcat/tc5.5.x/trunk/container/modules/ha/src/share/org/apache/catalina/ha/session/DeltaManager.java
Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=1061471&r1=1061470&r2=1061471&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Thu Jan 20 19:21:41 2011
@@ -25,13 +25,6 @@ $Id$
PATCHES PROPOSED TO BACKPORT:
[ New proposals should be added at the end of the list ]
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50547
- Add time stamp for CHANGE_SESSION_ID and SESSION_EXPIRED message.
- http://svn.apache.org/viewvc?view=revision&revision=1055798
- https://issues.apache.org/bugzilla/attachment.cgi?id=26482 (patch against
tc5.5)
- +1: kfujino, markt, jim
- -1:
-
* Remove JSSE13Factory, JSSE13SocketFactory classes,
because
- TC 5.5 runs on JRE 1.4+ and that comes bundled with JSSE 1.4,
Modified:
tomcat/tc5.5.x/trunk/container/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java?rev=1061471&r1=1061470&r2=1061471&view=diff
==============================================================================
---
tomcat/tc5.5.x/trunk/container/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java
(original)
+++
tomcat/tc5.5.x/trunk/container/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java
Thu Jan 20 19:21:41 2011
@@ -749,6 +749,7 @@ public class DeltaManager extends Manage
SessionMessage.EVT_CHANGE_SESSION_ID, data,
orgSessionID, orgSessionID + "-"
+ System.currentTimeMillis());
+ msg.setTimestamp(System.currentTimeMillis());
counterSend_EVT_CHANGE_SESSION_ID++;
send(msg);
} catch (IOException e) {
@@ -1534,6 +1535,7 @@ public class DeltaManager extends Manage
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));
Modified:
tomcat/tc5.5.x/trunk/container/modules/ha/src/share/org/apache/catalina/ha/session/DeltaManager.java
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/modules/ha/src/share/org/apache/catalina/ha/session/DeltaManager.java?rev=1061471&r1=1061470&r2=1061471&view=diff
==============================================================================
---
tomcat/tc5.5.x/trunk/container/modules/ha/src/share/org/apache/catalina/ha/session/DeltaManager.java
(original)
+++
tomcat/tc5.5.x/trunk/container/modules/ha/src/share/org/apache/catalina/ha/session/DeltaManager.java
Thu Jan 20 19:21:41 2011
@@ -644,6 +644,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) {
@@ -1307,6 +1308,7 @@ public class DeltaManager extends Cluste
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);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
