Author: kfujino
Date: Mon Jan 21 10:02:06 2013
New Revision: 1436249
URL: http://svn.apache.org/viewvc?rev=1436249&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/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
Modified: tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java?rev=1436249&r1=1436248&r2=1436249&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java Mon Jan
21 10:02:06 2013
@@ -527,7 +527,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 {
@@ -1163,11 +1163,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);
+ }
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
