Author: kfujino Date: Tue Jan 29 07:08:16 2013 New Revision: 1439758 URL: http://svn.apache.org/viewvc?rev=1439758&view=rev Log: Prevent the SSO deregister when web application is stopped or reloaded. When StandardManager(pathname="") or DeltaManager stops normally, all sessions in the context are expired. In this case, because most sessions is not time-out, SSO deregister was triggered.
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java?rev=1439758&r1=1439757&r2=1439758&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java Tue Jan 29 07:08:16 2013 @@ -238,7 +238,8 @@ public class SingleSignOn extends ValveB if (((session.getMaxInactiveInterval() > 0) && (System.currentTimeMillis() - session.getThisAccessedTimeInternal() >= session.getMaxInactiveInterval() * 1000)) - || (Session.SESSION_PASSIVATED_EVENT.equals(event.getType()))) { + || (Session.SESSION_PASSIVATED_EVENT.equals(event.getType())) + || (!session.getManager().getContainer().getState().isAvailable())) { removeSession(ssoId, session); } else { // The session was logged out. Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1439758&r1=1439757&r2=1439758&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Tue Jan 29 07:08:16 2013 @@ -83,6 +83,13 @@ <bug>54483</bug>: Correct one of the Spanish translations. Based on a suggestion from adinamita. (markt) </fix> + <fix> + Prevent the SSO deregister when web application is stopped or reloaded. + When StandardManager(pathname="") or DeltaManager stops normally, all + sessions in the context are expired. + In this case, because most sessions is not time-out, SSO deregister was + triggered. (kfujino) + </fix> </changelog> </subsection> <subsection name="Coyote"> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org