From cb980f12d52e85589e2711675aa4b5bf2f8631a2 Mon Sep 17 00:00:00 2001
From: Luke Taylor <luke.taylor@springsource.com>
Date: Thu, 6 Dec 2007 17:26:04 +0000
Subject: [PATCH] Tidying.

---
 .../logout/SecurityContextLogoutHandler.java  | 74 +++++++++----------
 1 file changed, 34 insertions(+), 40 deletions(-)

diff --git a/core/src/main/java/org/springframework/security/ui/logout/SecurityContextLogoutHandler.java b/core/src/main/java/org/springframework/security/ui/logout/SecurityContextLogoutHandler.java
index cb46376b71..e8765f6e67 100644
--- a/core/src/main/java/org/springframework/security/ui/logout/SecurityContextLogoutHandler.java
+++ b/core/src/main/java/org/springframework/security/ui/logout/SecurityContextLogoutHandler.java
@@ -25,56 +25,50 @@ import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
 /**
- * Performs a logout by modifying the
- * {@link org.springframework.security.context.SecurityContextHolder}.
- *
+ * Performs a logout by modifying the {@link org.springframework.security.context.SecurityContextHolder}.
  * <p>
- * Will also invalidate the {@link HttpSession} if
- * {@link #isInvalidateHttpSession()} is <code>true</code> and the session is
- * not <code>null</code>.
+ * Will also invalidate the {@link HttpSession} if {@link #isInvalidateHttpSession()} is <code>true</code> and the
+ * session is not <code>null</code>.
  *
  * @author Ben Alex
- * @version $Id: SecurityContextLogoutHandler.java 1784 2007-02-24 21:00:24Z
- * luke_t $
+ * @version $Id$
  */
 public class SecurityContextLogoutHandler implements LogoutHandler {
-	// ~ Methods
-	// ========================================================================================================
+    //~ Methods ========================================================================================================
 
-	private boolean invalidateHttpSession = true;
+    private boolean invalidateHttpSession = true;
 
-	/**
-	 * Requires the request to be passed in.
-	 *
-	 * @param request from which to obtain a HTTP session (cannot be null)
-	 * @param response not used (can be <code>null</code>)
-	 * @param authentication not used (can be <code>null</code>)
-	 */
-	public void logout(HttpServletRequest request, HttpServletResponse response, Authentication authentication) {
-		Assert.notNull(request, "HttpServletRequest required");
-		if (invalidateHttpSession) {
-			HttpSession session = request.getSession(false);
-			if (session != null) {
-				session.invalidate();
-			}
-		}
+    /**
+     * Requires the request to be passed in.
+     *
+     * @param request        from which to obtain a HTTP session (cannot be null)
+     * @param response       not used (can be <code>null</code>)
+     * @param authentication not used (can be <code>null</code>)
+     */
+    public void logout(HttpServletRequest request, HttpServletResponse response, Authentication authentication) {
+        Assert.notNull(request, "HttpServletRequest required");
+        if (invalidateHttpSession) {
+            HttpSession session = request.getSession(false);
+            if (session != null) {
+                session.invalidate();
+            }
+        }
 
-		SecurityContextHolder.clearContext();
-	}
+        SecurityContextHolder.clearContext();
+    }
 
-	public boolean isInvalidateHttpSession() {
-		return invalidateHttpSession;
-	}
+    public boolean isInvalidateHttpSession() {
+        return invalidateHttpSession;
+    }
 
-	/**
-	 * Causes the {@link HttpSession} to be invalidated when this
-	 * {@link LogoutHandler} is invoked. Defaults to true.
-	 *
-	 * @param invalidateHttpSession true if you wish the session to be
-	 * invalidated (default) or false if it should not be
-	 */
-	public void setInvalidateHttpSession(boolean invalidateHttpSession) {
-		this.invalidateHttpSession = invalidateHttpSession;
+    /**
+     * Causes the {@link HttpSession} to be invalidated when this {@link LogoutHandler} is invoked. Defaults to true.
+     *
+     * @param invalidateHttpSession true if you wish the session to be invalidated (default) or false if it should
+     * not be.
+     */
+    public void setInvalidateHttpSession(boolean invalidateHttpSession) {
+        this.invalidateHttpSession = invalidateHttpSession;
 	}
 
 }