KEYCLOAK-18680 Always close result stream

olivierlemasle · Jul 30, 2021 · 0cdce13 · 0cdce13
1 parent a412bb7
commit 0cdce13
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/model/jpa/src/main/java/org/keycloak/authorization/jpa/store/JPAPermissionTicketStore.java b/model/jpa/src/main/java/org/keycloak/authorization/jpa/store/JPAPermissionTicketStore.java
@@ -43,6 +43,7 @@
 import javax.persistence.LockModeType;
 
 import static org.keycloak.models.jpa.PaginationUtils.paginateQuery;
+import static org.keycloak.utils.StreamsUtil.closing;
 
 /**
  * @author <a href="mailto:psilva@redhat.com">Pedro Igor</a>
@@ -71,7 +72,7 @@ public long count(Map<PermissionTicket.FilterOption, String> attributes, String
 
         TypedQuery query = entityManager.createQuery(querybuilder);
 
-        return query.getResultStream().count();
+        return closing(query.getResultStream()).count();
     }
 
     private List<Predicate> getPredicates(CriteriaBuilder builder,

diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/JpaRealmProvider.java b/model/jpa/src/main/java/org/keycloak/models/jpa/JpaRealmProvider.java
@@ -284,8 +284,8 @@ public RoleModel getClientRole(ClientModel client, String name) {
     public Map<ClientModel, Set<String>> getAllRedirectUrisOfEnabledClients(RealmModel realm) {
         TypedQuery<Map> query = em.createNamedQuery("getAllRedirectUrisOfEnabledClients", Map.class);
         query.setParameter("realm", realm.getId());
-        return query.getResultStream()
-          .filter(s -> s.get("client") != null)
+        return closing(query.getResultStream()
+          .filter(s -> s.get("client") != null))
           .collect(
             Collectors.groupingBy(
               s -> new ClientAdapter(realm, em, session, (ClientEntity) s.get("client")),
@@ -903,7 +903,7 @@ public Map<String, ClientScopeModel> getClientScopes(RealmModel realm, ClientMod
         query.setParameter("clientId", client.getId());
         query.setParameter("defaultScope", defaultScope);
 
-        return query.getResultStream()
+        return closing(query.getResultStream())
                 .map(clientScopeId -> session.clientScopes().getClientScopeById(realm, clientScopeId))
                 .filter(Objects::nonNull)
                 .filter(clientScope -> Objects.equals(clientScope.getProtocol(), clientProtocol))

diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/session/JpaUserSessionPersisterProvider.java b/model/jpa/src/main/java/org/keycloak/models/jpa/session/JpaUserSessionPersisterProvider.java
@@ -294,7 +294,7 @@ public UserSessionModel loadUserSession(RealmModel realm, String userSessionId,
 
             Set<String> removedClientUUIDs = new HashSet<>();
 
-            clientSessionQuery.getResultStream().forEach(clientSession -> {
+            closing(clientSessionQuery.getResultStream()).forEach(clientSession -> {
                         boolean added = addClientSessionToAuthenticatedClientSessionsIfPresent(userSession, clientSession);
                         if (!added) {
                             // client was removed in the meantime