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/guitools/org/opends/guitools/controlpanel/ui/LocalOrRemotePanel.java |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/opends/src/guitools/org/opends/guitools/controlpanel/ui/LocalOrRemotePanel.java b/opends/src/guitools/org/opends/guitools/controlpanel/ui/LocalOrRemotePanel.java
index 95ef96f..d6ed200 100644
--- a/opends/src/guitools/org/opends/guitools/controlpanel/ui/LocalOrRemotePanel.java
+++ b/opends/src/guitools/org/opends/guitools/controlpanel/ui/LocalOrRemotePanel.java
@@ -958,7 +958,15 @@
       NamingEnumeration<SearchResult> en =
         ctx.search("cn=Version,cn=monitor", "objectclass=*",
           searchControls);
-      SearchResult sr = en.next();
+      SearchResult sr = null;
+      try
+      {
+        sr = en.next();
+      }
+      finally
+      {
+        en.close();
+      }
       CustomSearchResult csr =
         new CustomSearchResult(sr, "cn=Version,cn=monitor");
 

--
Gitblit v1.10.0