libre.sh/keycloak-scim
3
0
Fork 0
Code Issues 15 Pull requests Releases 1 Packages Activity Actions

Ensure componentsByParentAndType in CachedRealm is returned as a concurrent multi-valued map

Browse source 
Closes #30235

Signed-off-by: Stefan Guilhen <sguilhen@redhat.com>
This commit is contained in:
Stefan Guilhen 2024-10-01 16:53:04 -03:00 committed by Pedro Igor
parent 3887ee3006
commit 9b7cf9d584
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
common/src/main/java/org/keycloak/common/util/ConcurrentMultivaluedHashMap.java
View file

@ -18,6 +18,7 @@
package org.keycloak.common.util; package org.keycloak.common.util;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.CopyOnWriteArrayList;
@ -28,6 +29,15 @@ import java.util.concurrent.CopyOnWriteArrayList;
@SuppressWarnings("serial") @SuppressWarnings("serial")
public class ConcurrentMultivaluedHashMap<K, V> extends ConcurrentHashMap<K, List<V>> implements MultivaluedMap<K, V> public class ConcurrentMultivaluedHashMap<K, V> extends ConcurrentHashMap<K, List<V>> implements MultivaluedMap<K, V>
{ {
public ConcurrentMultivaluedHashMap() {
}
public ConcurrentMultivaluedHashMap(Map<K, List<V>> map) {
if (map == null) {
throw new IllegalArgumentException("Map can not be null");
}
putAll(map);
}
@Override @Override
public List<V> createListInstance() { public List<V> createListInstance() {

2
model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/CachedRealm.java vendored
View file

@ -696,7 +696,7 @@ public class CachedRealm extends AbstractExtendableRevisioned {
} }
public MultivaluedMap<String, ComponentModel> getComponentsByParentAndType() { public MultivaluedMap<String, ComponentModel> getComponentsByParentAndType() {
return new MultivaluedHashMap<>(componentsByParentAndType); return new ConcurrentMultivaluedHashMap<>(componentsByParentAndType);
} }
public Map<String, ComponentModel> getComponents() { public Map<String, ComponentModel> getComponents() {