Author: kfujino Date: Thu Apr 3 06:36:37 2014 New Revision: 1584267 URL: http://svn.apache.org/r1584267 Log: Remove cluster and replicationValve from cluster manager template. These instance are not necessary to template.
Modified: tomcat/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java?rev=1584267&r1=1584266&r2=1584267&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java (original) +++ tomcat/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java Thu Apr 3 06:36:37 2014 @@ -178,7 +178,6 @@ public abstract class ClusterManagerBase protected void clone(ClusterManagerBase copy) { copy.setName("Clone-from-" + getName()); - copy.setCluster(getCluster()); copy.setMaxActiveSessions(getMaxActiveSessions()); copy.setMaxInactiveInterval(getMaxInactiveInterval()); copy.setSessionIdLength(getSessionIdLength()); 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=1584267&r1=1584266&r2=1584267&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java (original) +++ tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java Thu Apr 3 06:36:37 2014 @@ -1560,7 +1560,6 @@ public class DeltaManager extends Cluste public ClusterManager cloneFromTemplate() { DeltaManager result = new DeltaManager(); clone(result); - result.replicationValve = replicationValve; result.expireSessionsOnShutdown = expireSessionsOnShutdown; result.notifySessionListenersOnReplication = notifySessionListenersOnReplication; result.notifyContainerListenersOnReplication = notifyContainerListenersOnReplication; Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1584267&r1=1584266&r2=1584267&view=diff ============================================================================== --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Thu Apr 3 06:36:37 2014 @@ -95,6 +95,10 @@ <code>LifecycleListener</code>, it works as nested components of Host or Engine. (kfujino) </scode> + <fix> + Remove cluster and replicationValve from cluster manager template. These + instance are not necessary to template. (kfujino) + </fix> </changelog> </subsection> <subsection name="Web applications"> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org