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/tasks/ImportTask.java | 11 ++---------
1 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tasks/ImportTask.java b/opendj-server-legacy/src/main/java/org/opends/server/tasks/ImportTask.java
index 04da0fb..e8b9fb1 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tasks/ImportTask.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tasks/ImportTask.java
@@ -24,7 +24,6 @@
import java.io.File;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
@@ -333,8 +332,7 @@
}
// Make sure the selected backend will handle all the include branches
- defaultIncludeBranches = new ArrayList<>(backend.getBaseDNs().length);
- Collections.addAll(defaultIncludeBranches, backend.getBaseDNs());
+ defaultIncludeBranches = new ArrayList<>(backend.getBaseDNs());
for(DN includeBranch : includeBranches)
{
@@ -486,8 +484,7 @@
}
// Find backends with subordinate base DNs that should be excluded from the import.
- defaultIncludeBranches = new HashSet<>(backend.getBaseDNs().length);
- Collections.addAll(defaultIncludeBranches, backend.getBaseDNs());
+ defaultIncludeBranches = new HashSet<>(backend.getBaseDNs());
if (backend.getSubordinateBackends() != null)
{
@@ -629,10 +626,6 @@
}
}
- // Get the set of base DNs for the backend as an array.
- DN[] baseDNs = new DN[defaultIncludeBranches.size()];
- defaultIncludeBranches.toArray(baseDNs);
-
// Notify the task listeners that an import is going to start
// this must be done before disabling the backend to allow
// listeners to get access to the backend configuration
--
Gitblit v1.10.0