Return-Path: X-Original-To: apmail-tomcat-dev-archive@www.apache.org Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C71EE10C27 for ; Thu, 3 Oct 2013 05:37:08 +0000 (UTC) Received: (qmail 42147 invoked by uid 500); 3 Oct 2013 05:36:56 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 41260 invoked by uid 500); 3 Oct 2013 05:36:48 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 41116 invoked by uid 99); 3 Oct 2013 05:36:44 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Oct 2013 05:36:44 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Oct 2013 05:36:41 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 4E63A23888E2 for ; Thu, 3 Oct 2013 05:36:20 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: dev@tomcat.apache.org From: kfujino@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20131003053620.4E63A23888E2@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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"/> - 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) + + Remove unused expireSessionsOnShutdown attribute in + org.apache.catalina.ha.session.BackupManager. (kfujino) + 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. - - 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 true. Default value is 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