From 958cc0238cfb7c6c3f0b27dae66f63d4c5cf94a6 Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Thu, 26 Jul 2007 12:01:44 +0000
Subject: [PATCH] Partial fix for issue 1831 - dsconfig interactive mode.
---
opendj-sdk/opends/src/server/org/opends/server/admin/client/ldap/JNDIDirContextAdaptor.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/admin/client/ldap/JNDIDirContextAdaptor.java b/opendj-sdk/opends/src/server/org/opends/server/admin/client/ldap/JNDIDirContextAdaptor.java
index 9443bdf..23ff928 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/admin/client/ldap/JNDIDirContextAdaptor.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/admin/client/ldap/JNDIDirContextAdaptor.java
@@ -152,7 +152,7 @@
@Override
public void deleteSubtree(LdapName dn) throws NamingException {
// Delete the children first.
- for (LdapName child : listEntries(dn)) {
+ for (LdapName child : listEntries(dn, null)) {
deleteSubtree(child);
}
@@ -189,8 +189,12 @@
* {@inheritDoc}
*/
@Override
- public Collection<LdapName> listEntries(LdapName dn) throws NamingException {
- String filter = "(objectClass=*)";
+ public Collection<LdapName> listEntries(LdapName dn, String filter)
+ throws NamingException {
+ if (filter == null) {
+ filter = "(objectClass=*)";
+ }
+
SearchControls controls = new SearchControls();
controls.setSearchScope(SearchControls.ONELEVEL_SCOPE);
--
Gitblit v1.10.0