From 85f51e5a07aa823b2b363304007ed812c73ecc59 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 19 Apr 2016 12:59:38 +0000
Subject: [PATCH] Changed Backend.getBaseDNs() return type from DN[] to Set<DN>
---
opendj-server-legacy/src/main/java/org/opends/server/monitors/BackendMonitor.java | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/monitors/BackendMonitor.java b/opendj-server-legacy/src/main/java/org/opends/server/monitors/BackendMonitor.java
index afd7cec..830330b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/monitors/BackendMonitor.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/monitors/BackendMonitor.java
@@ -21,13 +21,14 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
+import java.util.Set;
import org.forgerock.i18n.slf4j.LocalizedLogger;
+import org.forgerock.opendj.ldap.DN;
import org.forgerock.opendj.server.config.server.MonitorProviderCfg;
import org.opends.server.api.Backend;
import org.opends.server.api.MonitorData;
import org.opends.server.api.MonitorProvider;
-import org.forgerock.opendj.ldap.DN;
import org.opends.server.types.DirectoryConfig;
import org.opends.server.types.ObjectClass;
@@ -86,7 +87,7 @@
@Override
public MonitorData getMonitorData()
{
- DN[] baseDNs = backend.getBaseDNs();
+ Set<DN> baseDNs = backend.getBaseDNs();
MonitorData attrs = new MonitorData(6);
attrs.add(ATTR_MONITOR_BACKEND_ID, backend.getBackendID());
@@ -98,10 +99,17 @@
return attrs;
}
- private Collection<String> getBackendEntryCounts(DN[] baseDNs)
+ private Collection<String> getBackendEntryCounts(Set<DN> baseDNs)
{
Collection<String> results = new ArrayList<>();
- if (baseDNs.length != 1)
+ if (baseDNs.size() == 1)
+ {
+ // This is done to avoid recalculating the number of entries
+ // using the numSubordinates method in the case where the
+ // backend has a single base DN.
+ results.add(backend.getEntryCount() + " " + baseDNs.iterator().next());
+ }
+ else
{
for (DN dn : baseDNs)
{
@@ -117,13 +125,6 @@
results.add(entryCount + " " + dn);
}
}
- else
- {
- // This is done to avoid recalculating the number of entries
- // using the numSubordinates method in the case where the
- // backend has a single base DN.
- results.add(backend.getEntryCount() + " " + baseDNs[0]);
- }
return results;
}
}
--
Gitblit v1.10.0