Author: kfujino
Date: Fri Jan 7 08:08:01 2011
New Revision: 1056216
URL: http://svn.apache.org/viewvc?rev=1056216&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.
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=1056216&r1=1056215&r2=1056216&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Jan 7 08:08:01 2011
@@ -288,12 +288,6 @@ PATCHES PROPOSED TO BACKPORT:
+1: markt, fhanik, funkman
-1:
-* 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
- +1: kfujino, fhanik, funkman
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47319
Return IP address rather than null for getRemoteHost() and the APR connector
http://people.apache.org/~markt/patches/2011-01-06-bug47319-tc6.patch
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=1056216&r1=1056215&r2=1056216&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
Fri Jan 7 08:08:01 2011
@@ -645,6 +645,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) {
@@ -1330,6 +1331,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);
}
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=1056216&r1=1056215&r2=1056216&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Fri Jan 7 08:08:01 2011
@@ -340,6 +340,10 @@
If <code>maxInactiveInterval</code> is negative, the access message is
not
being sent. (kfujino)
</fix>
+ <fix>
+ <bug>50547</bug>: Add time stamp for CHANGE_SESSION_ID message and
+ SESSION_EXPIRED message. (kfujino)
+ </fix>
</changelog>
</subsection>
<subsection name="Webapps">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
