Author: remy.maucherat(a)jboss.com
Date: 2013-05-30 06:11:21 -0400 (Thu, 30 May 2013)
New Revision: 2205
Modified:
branches/7.2.x/src/main/java/org/apache/catalina/authenticator/AuthenticatorBase.java
branches/7.2.x/src/main/java/org/apache/catalina/authenticator/SingleSignOn.java
branches/8.0.x/src/main/java/org/apache/catalina/authenticator/AuthenticatorBase.java
branches/8.0.x/src/main/java/org/apache/catalina/authenticator/SingleSignOn.java
Log:
Rename logout method to avoid overriding in the AS code.
Modified:
branches/7.2.x/src/main/java/org/apache/catalina/authenticator/AuthenticatorBase.java
===================================================================
---
branches/7.2.x/src/main/java/org/apache/catalina/authenticator/AuthenticatorBase.java 2013-05-28
18:53:44 UTC (rev 2204)
+++
branches/7.2.x/src/main/java/org/apache/catalina/authenticator/AuthenticatorBase.java 2013-05-30
10:11:21 UTC (rev 2205)
@@ -732,7 +732,7 @@
sso.deregister(ssoId);
} else {
if (cache && session != null) {
- sso.logout(ssoId);
+ sso.removeLogin(ssoId);
}
}
}
Modified:
branches/7.2.x/src/main/java/org/apache/catalina/authenticator/SingleSignOn.java
===================================================================
---
branches/7.2.x/src/main/java/org/apache/catalina/authenticator/SingleSignOn.java 2013-05-28
18:53:44 UTC (rev 2204)
+++
branches/7.2.x/src/main/java/org/apache/catalina/authenticator/SingleSignOn.java 2013-05-30
10:11:21 UTC (rev 2205)
@@ -520,7 +520,7 @@
*
* @param ssoId Single sign on identifier to logout
*/
- public void logout(String ssoId) {
+ public void removeLogin(String ssoId) {
// Look up and remove the corresponding SingleSignOnEntry
SingleSignOnEntry sso = null;
Modified:
branches/8.0.x/src/main/java/org/apache/catalina/authenticator/AuthenticatorBase.java
===================================================================
---
branches/8.0.x/src/main/java/org/apache/catalina/authenticator/AuthenticatorBase.java 2013-05-28
18:53:44 UTC (rev 2204)
+++
branches/8.0.x/src/main/java/org/apache/catalina/authenticator/AuthenticatorBase.java 2013-05-30
10:11:21 UTC (rev 2205)
@@ -732,7 +732,7 @@
sso.deregister(ssoId);
} else {
if (cache && session != null) {
- sso.logout(ssoId);
+ sso.removeLogin(ssoId);
}
}
}
Modified:
branches/8.0.x/src/main/java/org/apache/catalina/authenticator/SingleSignOn.java
===================================================================
---
branches/8.0.x/src/main/java/org/apache/catalina/authenticator/SingleSignOn.java 2013-05-28
18:53:44 UTC (rev 2204)
+++
branches/8.0.x/src/main/java/org/apache/catalina/authenticator/SingleSignOn.java 2013-05-30
10:11:21 UTC (rev 2205)
@@ -520,7 +520,7 @@
*
* @param ssoId Single sign on identifier to logout
*/
- public void logout(String ssoId) {
+ public void removeLogin(String ssoId) {
// Look up and remove the corresponding SingleSignOnEntry
SingleSignOnEntry sso = null;
Show replies by date