From d10351e60b3f786a16abe58d916220bb29c0421f Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 25 Aug 2015 13:11:18 +0000
Subject: [PATCH] Use Collection.contains()
---
opendj-server-legacy/src/main/java/org/opends/server/tools/RebuildIndex.java | 16 +++++-----------
1 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/RebuildIndex.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/RebuildIndex.java
index f50c9fd..b2d05e6 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/RebuildIndex.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/RebuildIndex.java
@@ -603,30 +603,24 @@
*/
private Backend<?> retrieveBackend(final DN selectedDN) throws ConfigException, Exception
{
- Backend<?> backend = null;
-
final ArrayList<Backend> backendList = new ArrayList<>();
final ArrayList<BackendCfg> entryList = new ArrayList<>();
final ArrayList<List<DN>> dnList = new ArrayList<>();
BackendToolUtils.getBackends(backendList, entryList, dnList);
+ Backend<?> backend = null;
final int numBackends = backendList.size();
for (int i = 0; i < numBackends; i++)
{
final Backend<?> b = backendList.get(i);
final List<DN> baseDNs = dnList.get(i);
-
- for (final DN baseDN : baseDNs)
+ if (baseDNs.contains(selectedDN))
{
- if (baseDN.equals(selectedDN))
+ if (backend != null)
{
- if (backend != null)
- {
- throw new ConfigException(ERR_MULTIPLE_BACKENDS_FOR_BASE.get(baseDNString.getValue()));
- }
- backend = b;
- break;
+ throw new ConfigException(ERR_MULTIPLE_BACKENDS_FOR_BASE.get(baseDNString.getValue()));
}
+ backend = b;
}
}
--
Gitblit v1.10.0