From 0358e0c1bba0dc07d2141ac96c6ede5283631bd1 Mon Sep 17 00:00:00 2001
From: Ebert Toribio <eberttc@gmail.com>
Date: Fri, 23 Aug 2019 11:26:45 -0500
Subject: [PATCH] Use ConcurrentHashMap in
 InMemoryReactiveClientRegistrationRepository

Fixes gh-7299
---
 .../InMemoryReactiveClientRegistrationRepository.java      | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/registration/InMemoryReactiveClientRegistrationRepository.java b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/registration/InMemoryReactiveClientRegistrationRepository.java
index c93a93e91c2..c3b50a8d23e 100644
--- a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/registration/InMemoryReactiveClientRegistrationRepository.java
+++ b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/registration/InMemoryReactiveClientRegistrationRepository.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,11 +18,11 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
 import org.springframework.util.Assert;
-import org.springframework.util.ConcurrentReferenceHashMap;
 
 import reactor.core.publisher.Mono;
 
@@ -30,6 +30,7 @@
  * A Reactive {@link ClientRegistrationRepository} that stores {@link ClientRegistration}(s) in-memory.
  *
  * @author Rob Winch
+ * @author Ebert Toribio
  * @since 5.1
  * @see ClientRegistrationRepository
  * @see ClientRegistration
@@ -46,7 +47,7 @@ public final class InMemoryReactiveClientRegistrationRepository
 	 */
 	public InMemoryReactiveClientRegistrationRepository(ClientRegistration... registrations) {
 		Assert.notEmpty(registrations, "registrations cannot be empty");
-		this.clientIdToClientRegistration = new ConcurrentReferenceHashMap<>();
+		this.clientIdToClientRegistration = new ConcurrentHashMap<>();
 		for (ClientRegistration registration : registrations) {
 			Assert.notNull(registration, "registrations cannot contain null values");
 			this.clientIdToClientRegistration.put(registration.getRegistrationId(), registration);