Close Stream When Null Results

prthakre · jzheaux · commit 66664c710dc9 · 2025-08-14T11:20:37.000-06:00
Closes gh-1169 Signed-off-by: Prashant Thakre <prashant.thakre@vida.id>
diff --git 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

Original file line number	Diff line number	Diff line change
`@@ -1588,6 +1588,7 @@ <T> Stream<T> searchForStream(LdapQuery query, Function<SearchResult, T> mapper)`
`1588`	`1588`	`return ctx.search(base, encodedFilter, searchControls);`
`1589`	`1589`	`});`
`1590`	`1590`	`if (results == null) {`
	`1591`	`+ closeContextAndNamingEnumeration(ctx, null);`
`1591`	`1592`	`return Stream.empty();`
`1592`	`1593`	`}`
`1593`	`1594`	`return StreamSupport`