Return-Path: Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: (qmail 36785 invoked from network); 25 Aug 2010 11:26:56 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 25 Aug 2010 11:26:56 -0000 Received: (qmail 54523 invoked by uid 500); 25 Aug 2010 11:26:55 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 54375 invoked by uid 500); 25 Aug 2010 11:26:54 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 54366 invoked by uid 99); 25 Aug 2010 11:26:54 -0000 Received: from Unknown (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 25 Aug 2010 11:26:54 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 25 Aug 2010 11:26:36 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id A560E238899C; Wed, 25 Aug 2010 11:25:18 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r989016 - /tomcat/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java Date: Wed, 25 Aug 2010 11:25:18 -0000 To: dev@tomcat.apache.org From: markt@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100825112518.A560E238899C@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: markt Date: Wed Aug 25 11:25:18 2010 New Revision: 989016 URL: http://svn.apache.org/viewvc?rev=989016&view=rev Log: Trivial code clean-up Modified: tomcat/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java Modified: tomcat/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java?rev=989016&r1=989015&r2=989016&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java (original) +++ tomcat/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java Wed Aug 25 11:25:18 2010 @@ -127,9 +127,10 @@ public class SingleSignOn extends ValveB */ 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 ValveB } 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); } } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org