From 66c1a80d263b71195a525d1c1fdd59e464a606ae Mon Sep 17 00:00:00 2001
From: ludovicp <ludovicp@localhost>
Date: Fri, 20 Aug 2010 13:39:26 +0000
Subject: [PATCH] Fix all command lines that are doing Searches with JNDI, to avoid them sending systematic Abandon requests.
---
opends/src/ads/org/opends/admin/ads/util/ConnectionUtils.java | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/opends/src/ads/org/opends/admin/ads/util/ConnectionUtils.java b/opends/src/ads/org/opends/admin/ads/util/ConnectionUtils.java
index 7dfe426..a0e6e4a 100644
--- a/opends/src/ads/org/opends/admin/ads/util/ConnectionUtils.java
+++ b/opends/src/ads/org/opends/admin/ads/util/ConnectionUtils.java
@@ -39,6 +39,7 @@
import javax.naming.CommunicationException;
import javax.naming.Context;
+import javax.naming.NamingEnumeration;
import javax.naming.NamingException;
import javax.naming.directory.Attribute;
import javax.naming.directory.Attributes;
@@ -626,13 +627,23 @@
* Search for the config to check that it is the directory manager.
*/
SearchControls searchControls = new SearchControls();
- searchControls.setCountLimit(1);
searchControls.setSearchScope(
SearchControls. OBJECT_SCOPE);
searchControls.setReturningAttributes(
new String[] {"1.1"});
- ctx.search("cn=config", "objectclass=*", searchControls);
-
+ NamingEnumeration<SearchResult> sr =
+ ctx.search("cn=config", "objectclass=*", searchControls);
+ try
+ {
+ while (sr.hasMore())
+ {
+ sr.next();
+ }
+ }
+ finally
+ {
+ sr.close();
+ }
connectedAsAdministrativeUser = true;
} catch (NamingException ne)
{
--
Gitblit v1.10.0