Ensure map storage providers are closed upon session close

Fixes: keycloak#14730
olivierlemasle · Oct 5, 2022 · 36a1ce6 · 36a1ce6
1 parent 425b6b8
commit 36a1ce6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/model/map/src/main/java/org/keycloak/models/map/common/AbstractMapProviderFactory.java b/model/map/src/main/java/org/keycloak/models/map/common/AbstractMapProviderFactory.java
@@ -108,6 +108,7 @@ public String getId() {
     protected MapStorage<V, M> getStorage(KeycloakSession session) {
         ProviderFactory<MapStorageProvider> storageProviderFactory = getProviderFactoryOrComponentFactory(session, storageConfigScope);
         final MapStorageProvider factory = storageProviderFactory.create(session);
+        session.enlistForClose(factory);
         return factory.getStorage(modelType);
     }
 

diff --git a/services/src/main/java/org/keycloak/services/DefaultKeycloakSession.java b/services/src/main/java/org/keycloak/services/DefaultKeycloakSession.java
@@ -127,6 +127,11 @@ public void invalidate(InvalidableObjectType type, Object... ids) {
 
     @Override
     public void enlistForClose(Provider provider) {
+        for (Provider p : closable) {
+            if (p == provider) {    // Do not add the same provider twice
+                return;
+            }
+        }
         closable.add(provider);
     }