From 3be535a75c1f31169bdcdc365cce8edf0dcae154 Mon Sep 17 00:00:00 2001
From: Prashant <prashant.thakre@gmail.com>
Date: Wed, 23 Jul 2025 22:44:13 +0530
Subject: [PATCH 1/2] fix: close context

prevent file descriptor leakage in case returned result set is null.

Signed-off-by: Prashant <prashant.thakre@gmail.com>
---
 .../main/java/org/springframework/ldap/core/LdapTemplate.java    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/src/main/java/org/springframework/ldap/core/LdapTemplate.java b/core/src/main/java/org/springframework/ldap/core/LdapTemplate.java
index 5328ec0f5..a662fe259 100644
--- a/core/src/main/java/org/springframework/ldap/core/LdapTemplate.java
+++ b/core/src/main/java/org/springframework/ldap/core/LdapTemplate.java
@@ -1588,6 +1588,7 @@ <T> Stream<T> searchForStream(LdapQuery query, Function<SearchResult, T> mapper)
 			return ctx.search(base, encodedFilter, searchControls);
 		});
 		if (results == null) {
+			closeContextAndNamingEnumeration(ctx, null);
 			return Stream.empty();
 		}
 		return StreamSupport

From eb74e961d3bb4af10004ab68341921b7a08d287c Mon Sep 17 00:00:00 2001
From: Prashant <prashant.thakre@gmail.com>
Date: Wed, 23 Jul 2025 22:44:13 +0530
Subject: [PATCH 2/2] sign commit

Signed-off-by: Prashant Thakre <prashant.thakre@vida.id>
---
 .../main/java/org/springframework/ldap/core/LdapTemplate.java    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/src/main/java/org/springframework/ldap/core/LdapTemplate.java b/core/src/main/java/org/springframework/ldap/core/LdapTemplate.java
index 5328ec0f5..a662fe259 100644
--- a/core/src/main/java/org/springframework/ldap/core/LdapTemplate.java
+++ b/core/src/main/java/org/springframework/ldap/core/LdapTemplate.java
@@ -1588,6 +1588,7 @@ <T> Stream<T> searchForStream(LdapQuery query, Function<SearchResult, T> mapper)
 			return ctx.search(base, encodedFilter, searchControls);
 		});
 		if (results == null) {
+			closeContextAndNamingEnumeration(ctx, null);
 			return Stream.empty();
 		}
 		return StreamSupport