Author: markt Date: Thu Jul 29 12:28:40 2010 New Revision: 980424 URL: http://svn.apache.org/viewvc?rev=980424&view=rev Log: Follow on to r980418 Need to move registration with context to ManagerBase too
Modified: tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java tomcat/trunk/java/org/apache/catalina/session/PersistentManagerBase.java tomcat/trunk/java/org/apache/catalina/session/StandardManager.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=980424&r1=980423&r2=980424&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java (original) +++ tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java Thu Jul 29 12:28:40 2010 @@ -442,31 +442,6 @@ public class DeltaManager extends Cluste this.cluster = cluster; } - /** - * Set the Container with which this Manager has been associated. If it is a - * Context (the usual case), listen for changes to the session timeout - * property. - * - * @param container - * The associated Container - */ - @Override - public void setContainer(Container container) { - // De-register from the old Container (if any) - if ((this.container != null) && (this.container instanceof Context)) - ((Context) this.container).removePropertyChangeListener(this); - - // Default processing provided by our superclass - super.setContainer(container); - - // Register with the new Container (if any) - if ((this.container != null) && (this.container instanceof Context)) { - setMaxInactiveInterval(((Context) this.container).getSessionTimeout() * 60); - ((Context) this.container).addPropertyChangeListener(this); - } - - } - // --------------------------------------------------------- Public Methods /** Modified: tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java?rev=980424&r1=980423&r2=980424&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java (original) +++ tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java Thu Jul 29 12:28:40 2010 @@ -308,9 +308,21 @@ public abstract class ManagerBase extend */ public void setContainer(Container container) { + // De-register from the old Container (if any) + if ((this.container != null) && (this.container instanceof Context)) + ((Context) this.container).removePropertyChangeListener(this); + Container oldContainer = this.container; this.container = container; support.firePropertyChange("container", oldContainer, this.container); + + // Register with the new Container (if any) + if ((this.container != null) && (this.container instanceof Context)) { + setMaxInactiveInterval + ( ((Context) this.container).getSessionTimeout()*60 ); + ((Context) this.container).addPropertyChangeListener(this); + } + } Modified: tomcat/trunk/java/org/apache/catalina/session/PersistentManagerBase.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/PersistentManagerBase.java?rev=980424&r1=980423&r2=980424&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/session/PersistentManagerBase.java (original) +++ tomcat/trunk/java/org/apache/catalina/session/PersistentManagerBase.java Thu Jul 29 12:28:40 2010 @@ -25,8 +25,6 @@ import java.security.PrivilegedException import java.util.HashMap; import java.util.Map; -import org.apache.catalina.Container; -import org.apache.catalina.Context; import org.apache.catalina.Lifecycle; import org.apache.catalina.LifecycleException; import org.apache.catalina.LifecycleState; @@ -299,34 +297,6 @@ public abstract class PersistentManagerB /** - * Set the Container with which this Manager has been associated. If it is a - * Context (the usual case), listen for changes to the session timeout - * property. - * - * @param container - * The associated Container - */ - @Override - public void setContainer(Container container) { - - // De-register from the old Container (if any) - if ((this.container != null) && (this.container instanceof Context)) - ((Context) this.container).removePropertyChangeListener(this); - - // Default processing provided by our superclass - super.setContainer(container); - - // Register with the new Container (if any) - if ((this.container != null) && (this.container instanceof Context)) { - setMaxInactiveInterval - ( ((Context) this.container).getSessionTimeout()*60 ); - ((Context) this.container).addPropertyChangeListener(this); - } - - } - - - /** * Return descriptive information about this Manager implementation and * the corresponding version number, in the format * <code><description>/<version></code>. Modified: tomcat/trunk/java/org/apache/catalina/session/StandardManager.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/StandardManager.java?rev=980424&r1=980423&r2=980424&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/session/StandardManager.java (original) +++ tomcat/trunk/java/org/apache/catalina/session/StandardManager.java Thu Jul 29 12:28:40 2010 @@ -18,7 +18,6 @@ package org.apache.catalina.session; -import java.beans.PropertyChangeEvent; import java.io.BufferedInputStream; import java.io.BufferedOutputStream; import java.io.File; @@ -34,7 +33,6 @@ import java.security.PrivilegedException import java.util.ArrayList; import java.util.Iterator; import javax.servlet.ServletContext; -import org.apache.catalina.Container; import org.apache.catalina.Context; import org.apache.catalina.LifecycleException; import org.apache.catalina.LifecycleState; @@ -125,33 +123,6 @@ public class StandardManager extends Man /** - * Set the Container with which this Manager has been associated. If - * it is a Context (the usual case), listen for changes to the session - * timeout property. - * - * @param container The associated Container - */ - @Override - public void setContainer(Container container) { - - // De-register from the old Container (if any) - if ((this.container != null) && (this.container instanceof Context)) - ((Context) this.container).removePropertyChangeListener(this); - - // Default processing provided by our superclass - super.setContainer(container); - - // Register with the new Container (if any) - if ((this.container != null) && (this.container instanceof Context)) { - setMaxInactiveInterval - ( ((Context) this.container).getSessionTimeout()*60 ); - ((Context) this.container).addPropertyChangeListener(this); - } - - } - - - /** * Return descriptive information about this Manager implementation and * the corresponding version number, in the format * <code><description>/<version></code>. --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org