From: markt Date: Wed, 25 Aug 2010 11:25:18 +0000 (+0000) Subject: Trivial code clean-up X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=55b84919308bc8f4414ccfb3fb4afc2cf6325223;p=tomcat7.0 Trivial code clean-up git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@989016 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/java/org/apache/catalina/authenticator/SingleSignOn.java b/java/org/apache/catalina/authenticator/SingleSignOn.java index af060b965..c1b7b69d0 100644 --- a/java/org/apache/catalina/authenticator/SingleSignOn.java +++ b/java/org/apache/catalina/authenticator/SingleSignOn.java @@ -127,9 +127,10 @@ public class SingleSignOn extends ValveBase implements SessionListener { */ public void setCookieDomain(String cookieDomain) { if (cookieDomain != null && cookieDomain.trim().length() == 0) { - cookieDomain = null; + this.cookieDomain = null; + } else { + this.cookieDomain = cookieDomain; } - this.cookieDomain = cookieDomain; } /** @@ -373,16 +374,16 @@ public class SingleSignOn extends ValveBase implements SessionListener { } SingleSignOnEntry sso = lookup(ssoId); - if ( sso == null ) + if (sso == null) return; - sso.removeSession( session ); + sso.removeSession(session); // see if we are the last session, if so blow away ssoId Session sessions[] = sso.findSessions(); - if ( sessions == null || sessions.length == 0 ) { + if (sessions == null || sessions.length == 0) { synchronized (cache) { - sso = cache.remove(ssoId); + cache.remove(ssoId); } }