From 3f2a1c4c69cb09527aa92be3b5296ccae57c0f80 Mon Sep 17 00:00:00 2001 From: Scott Battaglia Date: Tue, 24 Nov 2009 15:34:32 +0000 Subject: [PATCH] CASC-96 reworked logic --- .../client/session/SingleSignOutFilter.java | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/session/SingleSignOutFilter.java b/cas-client-core/src/main/java/org/jasig/cas/client/session/SingleSignOutFilter.java index 9e5d53a..d09ab1d 100644 --- a/cas-client-core/src/main/java/org/jasig/cas/client/session/SingleSignOutFilter.java +++ b/cas-client-core/src/main/java/org/jasig/cas/client/session/SingleSignOutFilter.java @@ -88,22 +88,22 @@ public final class SingleSignOutFilter extends AbstractConfigurationFilter { } } else { final String artifact = CommonUtils.safeGetParameter(request, this.artifactParameterName); - final HttpSession session = request.getSession(false); - if (session != null) { + if (CommonUtils.isNotBlank(artifact)) { + final HttpSession session = request.getSession(true); + if (log.isDebugEnabled()) { log.debug("Storing session identifier for " + session.getId()); } - if (CommonUtils.isNotBlank(artifact)) { - try { - SESSION_MAPPING_STORAGE.removeBySessionById(session.getId()); - } catch (final Exception e) { - // ignore if the session is already marked as invalid. Nothing we can do! - } - SESSION_MAPPING_STORAGE.addSessionById(artifact, session); + + try { + SESSION_MAPPING_STORAGE.removeBySessionById(session.getId()); + } catch (final Exception e) { + // ignore if the session is already marked as invalid. Nothing we can do! } + SESSION_MAPPING_STORAGE.addSessionById(artifact, session); } else { - log.debug("No Session Found, so ignoring."); + log.debug("No Artifact Provided; no action taking place."); } }