root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Merge branch '2.0.x'

This commit is contained in:
Madhura Bhave 2018-09-04 17:09:52 -07:00
parent 9d1b3a2b49 9c82d5c382
commit f0d7533e0b
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/security/reactive/EndpointRequest.java
View File

@ -125,7 +125,7 @@ public final class EndpointRequest {
private final boolean includeLinks; private final boolean includeLinks;
private ServerWebExchangeMatcher delegate; private volatile ServerWebExchangeMatcher delegate;
private EndpointServerWebExchangeMatcher(boolean includeLinks) { private EndpointServerWebExchangeMatcher(boolean includeLinks) {
this(Collections.emptyList(), Collections.emptyList(), includeLinks); this(Collections.emptyList(), Collections.emptyList(), includeLinks);
@ -246,7 +246,7 @@ public final class EndpointRequest {
public static final class LinksServerWebExchangeMatcher public static final class LinksServerWebExchangeMatcher
extends ApplicationContextServerWebExchangeMatcher<WebEndpointProperties> { extends ApplicationContextServerWebExchangeMatcher<WebEndpointProperties> {
private ServerWebExchangeMatcher delegate; private volatile ServerWebExchangeMatcher delegate;
private LinksServerWebExchangeMatcher() { private LinksServerWebExchangeMatcher() {
super(WebEndpointProperties.class); super(WebEndpointProperties.class);

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

@ -70,8 +70,9 @@ public abstract class ApplicationContextServerWebExchangeMatcher<C>
if (this.context == null) { if (this.context == null) {
synchronized (this.contextLock) { synchronized (this.contextLock) {
if (this.context == null) { if (this.context == null) {
this.context = createContext(exchange); Supplier<C> createdContext = createContext(exchange);
initialized(this.context); initialized(createdContext);
this.context = createdContext;
} }
} }
} }