From e494ac5cf637c65c7fb25b1cac1dc936467e2136 Mon Sep 17 00:00:00 2001 From: "Marvin S. Addison" Date: Mon, 28 Oct 2013 15:58:40 -0400 Subject: [PATCH] Respond to code review feedback. 1. Call HttpServletRequest#logout() on SLO callback since it is available. 2. Use final for local variables where possible. --- .../main/java/org/jasig/cas/client/jaas/CasLoginModule.java | 2 +- .../org/jasig/cas/client/session/SingleSignOutHandler.java | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/jaas/CasLoginModule.java b/cas-client-core/src/main/java/org/jasig/cas/client/jaas/CasLoginModule.java index c76a58a..5deb87e 100644 --- a/cas-client-core/src/main/java/org/jasig/cas/client/jaas/CasLoginModule.java +++ b/cas-client-core/src/main/java/org/jasig/cas/client/jaas/CasLoginModule.java @@ -448,7 +448,7 @@ public class CasLoginModule implements LoginModule { // Remove cache entry if assertion caching is enabled if (this.cacheAssertions) { - for (TicketCredential ticket : this.subject.getPrivateCredentials(TicketCredential.class)) { + for (final TicketCredential ticket : this.subject.getPrivateCredentials(TicketCredential.class)) { logger.debug("Removing cached assertion for {}", ticket); ASSERTION_CACHE.remove(ticket); } diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/session/SingleSignOutHandler.java b/cas-client-core/src/main/java/org/jasig/cas/client/session/SingleSignOutHandler.java index fc530e9..8434bc4 100644 --- a/cas-client-core/src/main/java/org/jasig/cas/client/session/SingleSignOutHandler.java +++ b/cas-client-core/src/main/java/org/jasig/cas/client/session/SingleSignOutHandler.java @@ -20,6 +20,8 @@ package org.jasig.cas.client.session; import java.util.Arrays; import java.util.List; + +import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; import org.jasig.cas.client.util.CommonUtils; @@ -173,7 +175,9 @@ public final class SingleSignOutHandler { try { session.invalidate(); - // TODO: Add request.logout() upon bump to Servlet 3.0 API dependency + request.logout(); + } catch (final ServletException e) { + logger.debug("Error performing request.logout."); } catch (final IllegalStateException e) { logger.debug("Error invalidating session.", e); }