From ef394b6f63baf5710ea8da85b0311e0d8b94347d Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Mon, 21 Nov 2016 10:43:14 +0000
Subject: [PATCH] OPENDJ-3460 Fix computation of naming contexts in Root DSE

---
 opendj-server-legacy/src/main/java/org/opends/server/backends/RootDSEBackend.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/RootDSEBackend.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/RootDSEBackend.java
index 47c51e3..30c8f66 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/RootDSEBackend.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/RootDSEBackend.java
@@ -59,6 +59,7 @@
 import org.opends.server.api.ClientConnection;
 import org.opends.server.core.AddOperation;
 import org.opends.server.core.BackendConfigManager;
+import org.opends.server.core.BackendConfigManager.NamingContextFilter;
 import org.opends.server.core.DeleteOperation;
 import org.opends.server.core.DirectoryServer;
 import org.opends.server.core.ModifyDNOperation;
@@ -328,8 +329,9 @@
     Map<AttributeType, List<Attribute>> dseOperationalAttrs = new HashMap<>();
 
     BackendConfigManager manager = serverContext.getBackendConfigManager();
-    Set<DN> publicNamingContexts =
-        manager.getNamingContexts(showSubordinatesNamingContexts ?  PUBLIC : PUBLIC, TOP_LEVEL);
+    NamingContextFilter[] filters = showSubordinatesNamingContexts ?
+        new NamingContextFilter[] {PUBLIC} : new NamingContextFilter[] {PUBLIC, TOP_LEVEL};
+    Set<DN> publicNamingContexts = manager.getNamingContexts(filters);
     Attribute publicNamingContextAttr = createAttribute(ATTR_NAMING_CONTEXTS, publicNamingContexts);
     addAttribute(publicNamingContextAttr, dseUserAttrs, dseOperationalAttrs);
 

--
Gitblit v1.10.0