Merge remote-tracking branch 'origin/5.8.x'

web/src/main/java/org/springframework/security/web/context/HttpSessionSecurityContextRepository.java

@@ -141,7 +141,7 @@ public class HttpSessionSecurityContextRepository implements SecurityContextRepo
 				SaveContextOnUpdateOrErrorResponseWrapper.class);
 		if (responseWrapper == null) {
 			boolean httpSessionExists = request.getSession(false) != null;
-			SecurityContext initialContext = SecurityContextHolder.createEmptyContext();
+			SecurityContext initialContext = this.securityContextHolderStrategy.createEmptyContext();
 			responseWrapper = new SaveToSessionResponseWrapper(response, request, httpSessionExists, initialContext);
 		}
 		responseWrapper.saveContext(context);