From e6edbcc813d2c8f040497e9e809cf8e63c3222ad Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Mon, 07 Nov 2016 15:05:30 +0000
Subject: [PATCH] OPENDJ-3417 Update retrieval of controls and features to use backends methods
---
opendj-server-legacy/src/main/java/org/opends/server/backends/RootDSEBackend.java | 14 +-------------
1 files changed, 1 insertions(+), 13 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 fc300ea..4b235a8 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
@@ -335,7 +335,7 @@
addAttribute(privateNamingContextAttr, dseUserAttrs, dseOperationalAttrs);
// Add the "supportedControl" attribute.
- Attribute supportedControlAttr = createAttribute(ATTR_SUPPORTED_CONTROL, getAllControls());
+ Attribute supportedControlAttr = createAttribute(ATTR_SUPPORTED_CONTROL, DirectoryServer.getSupportedControls());
addAttribute(supportedControlAttr, dseUserAttrs, dseOperationalAttrs);
// Add the "supportedExtension" attribute.
@@ -414,18 +414,6 @@
return e;
}
- private Set<String> getAllControls()
- {
- // TODO: this duplicates what is done in DirectoryServer (see DirectoryServer.getSupportedControls())
- // How should this be handled ?
- final Set<String> controls = new HashSet<>();
- for (Backend<?> backend : serverContext.getBackendConfigManager().getAllBackends())
- {
- controls.addAll(backend.getSupportedControls());
- }
- return controls;
- }
-
private Set<DN> getAllPublicNamingContexts()
{
Set<DN> namingContexts = new HashSet<>();
--
Gitblit v1.10.0