From 1ba9c4316ed7e368f8d0c32e71a6f2fde5669d77 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.

---
 opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/util/RemoteSchemaLoader.java |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/util/RemoteSchemaLoader.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/util/RemoteSchemaLoader.java
index 0711ca8..682b8c3 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/util/RemoteSchemaLoader.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/util/RemoteSchemaLoader.java
@@ -93,7 +93,15 @@
       ctx.search(ConfigConstants.DN_DEFAULT_SCHEMA_ROOT,
           filter,
           searchControls);
-    SearchResult sr = srs.next();
+    SearchResult sr = null;
+    try
+    {
+      sr = srs.next();
+    }
+    finally
+    {
+      srs.close();
+    }
     CustomSearchResult csr = new CustomSearchResult(sr,
         ConfigConstants.DN_DEFAULT_SCHEMA_ROOT);
 

--
Gitblit v1.10.0