From 5b1bd87e7abd5b0341a43e8eade9f9bb9277c1f4 Mon Sep 17 00:00:00 2001
From: "Marvin S. Addison" <marvin.addison@gmail.com>
Date: Mon, 28 Oct 2013 16:07:28 -0400
Subject: [PATCH] Put HttpServletRequest#logout() in separate try/catch block.

---
 .../org/jasig/cas/client/session/SingleSignOutHandler.java  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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 8434bc4..943aa6b 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
@@ -175,11 +175,13 @@ public final class SingleSignOutHandler {
 
                 try {
                     session.invalidate();
+                } catch (final IllegalStateException e) {
+                    logger.debug("Error invalidating session.", e);
+                }
+                try {
                     request.logout();
                 } catch (final ServletException e) {
                     logger.debug("Error performing request.logout.");
-                } catch (final IllegalStateException e) {
-                    logger.debug("Error invalidating session.", e);
                 }
             }
         }