Address SecurityContextHolder memory leak
To get current context without creating a new context. Creating a new context may cause ThreadLocal leak. Closes gh-9841
This commit is contained in:
committed by
Josh Cummings
parent
898ba67098
commit
809ff883b0
@@ -44,6 +44,11 @@ final class GlobalSecurityContextHolderStrategy implements SecurityContextHolder
|
||||
return contextHolder;
|
||||
}
|
||||
|
||||
@Override
|
||||
public SecurityContext peekContext() {
|
||||
return contextHolder;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setContext(SecurityContext context) {
|
||||
Assert.notNull(context, "Only non-null SecurityContext instances are permitted");
|
||||
|
||||
@@ -44,6 +44,11 @@ final class InheritableThreadLocalSecurityContextHolderStrategy implements Secur
|
||||
return ctx;
|
||||
}
|
||||
|
||||
@Override
|
||||
public SecurityContext peekContext() {
|
||||
return contextHolder.get();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setContext(SecurityContext context) {
|
||||
Assert.notNull(context, "Only non-null SecurityContext instances are permitted");
|
||||
|
||||
@@ -123,6 +123,14 @@ public class SecurityContextHolder {
|
||||
return strategy.getContext();
|
||||
}
|
||||
|
||||
/**
|
||||
* Peeks the current <code>SecurityContext</code>.
|
||||
* @return the security context (may be <code>null</code>)
|
||||
*/
|
||||
public static SecurityContext peekContext() {
|
||||
return strategy.peekContext();
|
||||
}
|
||||
|
||||
/**
|
||||
* Primarily for troubleshooting purposes, this method shows how many times the class
|
||||
* has re-initialized its <code>SecurityContextHolderStrategy</code>.
|
||||
|
||||
@@ -38,6 +38,12 @@ public interface SecurityContextHolderStrategy {
|
||||
*/
|
||||
SecurityContext getContext();
|
||||
|
||||
/**
|
||||
* Peeks the current context without creating an empty context.
|
||||
* @return a context (may be <code>null</code>)
|
||||
*/
|
||||
SecurityContext peekContext();
|
||||
|
||||
/**
|
||||
* Sets the current context.
|
||||
* @param context to the new argument (should never be <code>null</code>, although
|
||||
|
||||
@@ -45,6 +45,11 @@ final class ThreadLocalSecurityContextHolderStrategy implements SecurityContextH
|
||||
return ctx;
|
||||
}
|
||||
|
||||
@Override
|
||||
public SecurityContext peekContext() {
|
||||
return contextHolder.get();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setContext(SecurityContext context) {
|
||||
Assert.notNull(context, "Only non-null SecurityContext instances are permitted");
|
||||
|
||||
Reference in New Issue
Block a user