Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add missing null checks and volatile keyword

Browse Source 
Closes gh-11692
This commit is contained in:
Johnny Lim
2018-01-19 22:17:09 +09:00
committed by Stephane Nicoll
parent 66164bff14
commit 13a7c9df4b
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/security/reactive/ApplicationContextServerWebExchangeMatcher.java
View File

@@ -43,9 +43,9 @@ public abstract class ApplicationContextServerWebExchangeMatcher<C>
private final Class<? extends C> contextClass;
private C context;
private volatile C context;
private Object contextLock = new Object();
private final Object contextLock = new Object();
public ApplicationContextServerWebExchangeMatcher(Class<? extends C> contextClass) {
Assert.notNull(contextClass, "Context class must not be null");
@@ -68,8 +68,10 @@ public abstract class ApplicationContextServerWebExchangeMatcher<C>
protected C getContext(ServerWebExchange exchange) {
if (this.context == null) {
synchronized (this.contextLock) {
this.context = createContext(exchange);
initialized(this.context);
if (this.context == null) {
this.context = createContext(exchange);
initialized(this.context);
}
}
}
return this.context;

8
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/security/servlet/ApplicationContextRequestMatcher.java
View File

@@ -45,7 +45,7 @@ public abstract class ApplicationContextRequestMatcher<C> implements RequestMatc
private volatile C context;
private Object contextLock = new Object();
private final Object contextLock = new Object();
public ApplicationContextRequestMatcher(Class<? extends C> contextClass) {
Assert.notNull(contextClass, "Context class must not be null");
@@ -68,8 +68,10 @@ public abstract class ApplicationContextRequestMatcher<C> implements RequestMatc
private C getContext(HttpServletRequest request) {
if (this.context == null) {
synchronized (this.contextLock) {
this.context = createContext(request);
initialized(this.context);
if (this.context == null) {
this.context = createContext(request);
initialized(this.context);
}
}
}
return this.context;