Merge branch '2.0.x'

mavenprojects · Sep 5, 2018 · f0d7533 · f0d7533
2 parents 9d1b3a2 + 9c82d5c
commit f0d7533
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/...ava/org/springframework/boot/actuate/autoconfigure/security/reactive/EndpointRequest.java b/...ava/org/springframework/boot/actuate/autoconfigure/security/reactive/EndpointRequest.java
@@ -125,7 +125,7 @@ public static final class EndpointServerWebExchangeMatcher
 
 		private final boolean includeLinks;
 
-		private ServerWebExchangeMatcher delegate;
+		private volatile ServerWebExchangeMatcher delegate;
 
 		private EndpointServerWebExchangeMatcher(boolean includeLinks) {
 			this(Collections.emptyList(), Collections.emptyList(), includeLinks);
@@ -246,7 +246,7 @@ protected Mono<MatchResult> matches(ServerWebExchange exchange,
 	public static final class LinksServerWebExchangeMatcher
 			extends ApplicationContextServerWebExchangeMatcher<WebEndpointProperties> {
 
-		private ServerWebExchangeMatcher delegate;
+		private volatile ServerWebExchangeMatcher delegate;
 
 		private LinksServerWebExchangeMatcher() {
 			super(WebEndpointProperties.class);

diff --git a/...rg/springframework/boot/security/reactive/ApplicationContextServerWebExchangeMatcher.java b/...rg/springframework/boot/security/reactive/ApplicationContextServerWebExchangeMatcher.java
@@ -70,8 +70,9 @@ protected Supplier<C> getContext(ServerWebExchange exchange) {
 		if (this.context == null) {
 			synchronized (this.contextLock) {
 				if (this.context == null) {
-					this.context = createContext(exchange);
-					initialized(this.context);
+					Supplier<C> createdContext = createContext(exchange);
+					initialized(createdContext);
+					this.context = createdContext;
 				}
 			}
 		}