Author: kfujino
Date: Mon Jan 21 10:06:33 2013
New Revision: 1436252
URL: http://svn.apache.org/viewvc?rev=1436252&view=rev
Log:
Fix incorrect increment of counterSend_EVT_SESSION_EXPIRED and
counterSend_EVT_CHANGE_SESSION_ID.
These values are not incremented if no members active in cluster group.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java?rev=1436252&r1=1436251&r2=1436252&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
Mon Jan 21 10:06:33 2013
@@ -542,7 +542,7 @@ public class DeltaManager extends Cluste
// original sessionID
String orgSessionID = session.getId();
super.changeSessionId(session);
- if (notify) {
+ if (notify && cluster.getMembers().length > 0) {
// changed sessionID
String newSessionID = session.getId();
try {
@@ -1176,11 +1176,14 @@ public class DeltaManager extends Cluste
* session id
*/
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);
+ if(cluster.getMembers().length > 0 ) {
+ 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/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1436252&r1=1436251&r2=1436252&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon Jan 21 10:06:33 2013
@@ -85,6 +85,15 @@
</fix>
</changelog>
</subsection>
+ <subsection name="Cluster">
+ <changelog>
+ <fix>
+ Fix incorrect increment of <code>counterSend_EVT_SESSION_EXPIRED</code>
+ and <code>counterSend_EVT_CHANGE_SESSION_ID</code>. These values are
not
+ incremented if no members active in cluster group. (kfujino)
+ </fix>
+ </changelog>
+ </subsection>
</section>
<section name="Tomcat 7.0.35 (markt)" rtext="2013-01-16">
<subsection name="Catalina">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
