From 443231d1e8df1861a46cc2fbf6e5e61697720f01 Mon Sep 17 00:00:00 2001 From: Rob Winch Date: Mon, 4 Oct 2010 17:07:04 -0500 Subject: [PATCH] SEC-1578: Use ThreadLocal.remove() instead of ThreadLocal.set(null) --- .../InheritableThreadLocalSecurityContextHolderStrategy.java | 2 +- .../core/context/ThreadLocalSecurityContextHolderStrategy.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/org/springframework/security/core/context/InheritableThreadLocalSecurityContextHolderStrategy.java b/core/src/main/java/org/springframework/security/core/context/InheritableThreadLocalSecurityContextHolderStrategy.java index 888805c696..2f20146456 100644 --- a/core/src/main/java/org/springframework/security/core/context/InheritableThreadLocalSecurityContextHolderStrategy.java +++ b/core/src/main/java/org/springframework/security/core/context/InheritableThreadLocalSecurityContextHolderStrategy.java @@ -35,7 +35,7 @@ final class InheritableThreadLocalSecurityContextHolderStrategy implements Secur //~ Methods ======================================================================================================== public void clearContext() { - contextHolder.set(null); + contextHolder.remove(); } public SecurityContext getContext() { diff --git a/core/src/main/java/org/springframework/security/core/context/ThreadLocalSecurityContextHolderStrategy.java b/core/src/main/java/org/springframework/security/core/context/ThreadLocalSecurityContextHolderStrategy.java index 2791e7a1b7..704f277a00 100644 --- a/core/src/main/java/org/springframework/security/core/context/ThreadLocalSecurityContextHolderStrategy.java +++ b/core/src/main/java/org/springframework/security/core/context/ThreadLocalSecurityContextHolderStrategy.java @@ -34,7 +34,7 @@ final class ThreadLocalSecurityContextHolderStrategy implements SecurityContextH //~ Methods ======================================================================================================== public void clearContext() { - contextHolder.set(null); + contextHolder.remove(); } public SecurityContext getContext() {