From 3749749fcfc4a3f9821fa8df2c0b93688971628e Mon Sep 17 00:00:00 2001
From: ludovicp <ludovicp@localhost>
Date: Mon, 31 May 2010 12:48:19 +0000
Subject: [PATCH] Fix for issue #4536. Close JNDI enumerations to avoid unbinding and closing underlying LDAP connection. Fixes in all CLI and control panel.
---
opends/src/server/org/opends/server/tools/dsreplication/ReplicationCliMain.java | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/opends/src/server/org/opends/server/tools/dsreplication/ReplicationCliMain.java b/opends/src/server/org/opends/server/tools/dsreplication/ReplicationCliMain.java
index e111222..b6618a1 100644
--- a/opends/src/server/org/opends/server/tools/dsreplication/ReplicationCliMain.java
+++ b/opends/src/server/org/opends/server/tools/dsreplication/ReplicationCliMain.java
@@ -7745,7 +7745,15 @@
{
NamingEnumeration<SearchResult> res =
ctx.search(dn, filter, searchControls);
- SearchResult sr = res.next();
+ SearchResult sr = null;
+ try
+ {
+ sr = res.next();
+ }
+ finally
+ {
+ res.close();
+ }
String logMsg = getFirstValue(sr, "ds-task-log-message");
if (logMsg != null)
{
@@ -7898,7 +7906,15 @@
{
NamingEnumeration<SearchResult> res =
ctx.search(dn, filter, searchControls);
- SearchResult sr = res.next();
+ SearchResult sr = null;
+ try
+ {
+ sr = res.next();
+ }
+ finally
+ {
+ res.close();
+ }
// Get the number of entries that have been handled and
// a percentage...
--
Gitblit v1.10.0