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/backends/BackupBackend.java | 17 +++++------------
1 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/BackupBackend.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/BackupBackend.java
index 35176ec..37386cd 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/BackupBackend.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/BackupBackend.java
@@ -42,6 +42,8 @@
import org.forgerock.opendj.ldap.AVA;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ConditionResult;
+import org.forgerock.opendj.ldap.DN;
+import org.forgerock.opendj.ldap.RDN;
import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.SearchScope;
import org.forgerock.opendj.ldap.schema.AttributeType;
@@ -61,7 +63,6 @@
import org.opends.server.types.BackupConfig;
import org.opends.server.types.BackupDirectory;
import org.opends.server.types.BackupInfo;
-import org.forgerock.opendj.ldap.DN;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.Entry;
import org.opends.server.types.IndexType;
@@ -70,7 +71,6 @@
import org.opends.server.types.LDIFImportConfig;
import org.opends.server.types.LDIFImportResult;
import org.opends.server.types.ObjectClass;
-import org.forgerock.opendj.ldap.RDN;
import org.opends.server.types.RestoreConfig;
import org.opends.server.types.SearchFilter;
@@ -97,7 +97,7 @@
private DN backupBaseDN;
/** The set of base DNs for this backend. */
- private DN[] baseDNs;
+ private Set<DN> baseDNs;
/** The backup base entry. */
private Entry backupBaseEntry;
@@ -208,8 +208,7 @@
throw new InitializationException(message, e);
}
- // FIXME -- Deal with this more correctly.
- this.baseDNs = new DN[] { backupBaseDN };
+ this.baseDNs = Collections.singleton(backupBaseDN);
// Determine the set of backup directories that we will use by default.
@@ -276,18 +275,12 @@
}
}
-
-
- /** {@inheritDoc} */
@Override
- public DN[] getBaseDNs()
+ public Set<DN> getBaseDNs()
{
return baseDNs;
}
-
-
- /** {@inheritDoc} */
@Override
public long getEntryCount()
{
--
Gitblit v1.10.0