tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kfuj...@apache.org
Subject svn commit: r1528719 - in /tomcat/trunk: java/org/apache/catalina/ha/session/BackupManager.java java/org/apache/catalina/ha/session/mbeans-descriptors.xml webapps/docs/changelog.xml webapps/docs/config/cluster-manager.xml
Date Thu, 03 Oct 2013 05:36:20 GMT
Author: kfujino
Date: Thu Oct  3 05:36:19 2013
New Revision: 1528719

URL: http://svn.apache.org/r1528719
Log:
Remove unused expireSessionsOnShutdown attribute in BackupManager.

Modified:
    tomcat/trunk/java/org/apache/catalina/ha/session/BackupManager.java
    tomcat/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml
    tomcat/trunk/webapps/docs/changelog.xml
    tomcat/trunk/webapps/docs/config/cluster-manager.xml

Modified: tomcat/trunk/java/org/apache/catalina/ha/session/BackupManager.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/BackupManager.java?rev=1528719&r1=1528718&r2=1528719&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/session/BackupManager.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/BackupManager.java Thu Oct  3 05:36:19
2013
@@ -51,9 +51,6 @@ public class BackupManager extends Clust
 
     protected static final long DEFAULT_REPL_TIMEOUT = 15000;//15 seconds
 
-    /** Set to true if we don't want the sessions to expire on shutdown */
-    protected boolean mExpireSessionsOnShutdown = true;
-
     /**
      * The name of this manager
      */
@@ -91,17 +88,6 @@ public class BackupManager extends Clust
     public void messageDataReceived(ClusterMessage msg) {
     }
 
-    public void setExpireSessionsOnShutdown(boolean expireSessionsOnShutdown)
-    {
-        mExpireSessionsOnShutdown = expireSessionsOnShutdown;
-    }
-
-    public boolean getExpireSessionsOnShutdown()
-    {
-        return mExpireSessionsOnShutdown;
-    }
-
-
     @Override
     public ClusterMessage requestCompleted(String sessionId) {
         if (!getState().isAvailable()) return null;
@@ -256,7 +242,6 @@ public class BackupManager extends Clust
     public ClusterManager cloneFromTemplate() {
         BackupManager result = new BackupManager();
         clone(result);
-        result.mExpireSessionsOnShutdown = mExpireSessionsOnShutdown;
         result.mapSendOptions = mapSendOptions;
         result.rpcTimeout = rpcTimeout;
         result.terminateOnStartFailure = terminateOnStartFailure;

Modified: tomcat/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml?rev=1528719&r1=1528718&r2=1528719&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml (original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml Thu Oct  3 05:36:19
2013
@@ -435,11 +435,6 @@
       description="Number of sessions that expired ( doesn't include explicit invalidations
)"
       type="long"/>
     <attribute
-      name="expireSessionsOnShutdown"
-      is="true"
-      description="expire all sessions cluster wide as one node goes down"
-      type="boolean"/>
-    <attribute
       name="invalidatedSessions"
       description="Get the list of invalidated session."
       type="[Ljava.lang.String;"/>

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1528719&r1=1528718&r2=1528719&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Oct  3 05:36:19 2013
@@ -235,6 +235,10 @@
         Modify method signature in ReplicationValve. Cluster instance is not
         necessary to argument of method. (kfujino)
       </scode>
+      <scode>
+        Remove unused <code>expireSessionsOnShutdown</code> attribute in
+        <code>org.apache.catalina.ha.session.BackupManager</code>. (kfujino)
+      </scode>
     </changelog>
   </subsection>
   <subsection name="Web applications">

Modified: tomcat/trunk/webapps/docs/config/cluster-manager.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/cluster-manager.xml?rev=1528719&r1=1528718&r2=1528719&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/config/cluster-manager.xml (original)
+++ tomcat/trunk/webapps/docs/config/cluster-manager.xml Thu Oct  3 05:36:19 2013
@@ -77,12 +77,6 @@
         when session attributes are being replicated or removed across Tomcat
         nodes in the cluster.
       </attribute>
-      <attribute name="expireSessionsOnShutdown" required="false">
-        When a web application is being shutdown, Tomcat issues an expire call
-        to each session to notify all the listeners. If you wish for all
-        sessions to expire on all nodes when a shutdown occurs on one node, set
-        this value to <code>true</code>. Default value is <code>false</code>.
-      </attribute>
       <attribute name="sessionAttributeFilter" required="false">
         A regular expression used to filter, which session attributes will
         be replicated. An attribute will only be replicated, if its name



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message