From 9f95b6ec63489f70df98617ece794e1ce2c9f0df Mon Sep 17 00:00:00 2001
From: Alexander Schwartz <aschwart@redhat.com>
Date: Mon, 24 Oct 2022 15:39:47 +0200
Subject: [PATCH] Remove unnecessary lookup of an entity via the session

Closes #11744
---
 .../org/keycloak/models/map/client/MapClientProvider.java     | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/model/map/src/main/java/org/keycloak/models/map/client/MapClientProvider.java b/model/map/src/main/java/org/keycloak/models/map/client/MapClientProvider.java
index d431b627d58..276d9f51f57 100644
--- a/model/map/src/main/java/org/keycloak/models/map/client/MapClientProvider.java
+++ b/model/map/src/main/java/org/keycloak/models/map/client/MapClientProvider.java
@@ -353,9 +353,7 @@ public class MapClientProvider implements ClientProvider {
 
         try (Stream<MapClientEntity> toRemove = tx.read(withCriteria(mcb))) {
             toRemove
-                .map(clientEntity -> session.clients().getClientById(realm, clientEntity.getId()))
-                .filter(Objects::nonNull)
-                .forEach(clientModel -> clientModel.deleteScopeMapping(role));
+                    .forEach(clientEntity -> clientEntity.removeScopeMapping(role.getId()));
         }
     }