From 935d387aca4e822929f026d987f8b95230c504d3 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 07 Mar 2016 15:12:17 +0000
Subject: [PATCH] OPENDJ-1342 Migrate AVA, RDN, and DN classes: Fix change in behaviour for DN.toNormalizedByteString()
---
opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeTasks.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeTasks.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeTasks.java
index b13efc6..8ef3333 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeTasks.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeTasks.java
@@ -28,6 +28,7 @@
import java.io.File;
import java.io.IOException;
import java.util.Arrays;
+import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedList;
@@ -604,12 +605,11 @@
* A message describing why the index needs to be rebuilt and asking
* them whether or not they wish to perform this task after the
* upgrade.
- * @param index
- * The index to rebuild.
+ * @param indexNames
+ * The indexes to rebuild.
* @return The rebuild index task.
*/
- public static UpgradeTask rebuildSingleIndex(final LocalizableMessage summary,
- final String index)
+ public static UpgradeTask rebuildIndexesNamed(final LocalizableMessage summary, final String... indexNames)
{
return new AbstractUpgradeTask()
{
@@ -628,7 +628,7 @@
{
if (isATaskToPerform)
{
- indexesToRebuild.add(index);
+ Collections.addAll(indexesToRebuild, indexNames);
}
else
{
@@ -641,7 +641,7 @@
{
if (!isRebuildAllIndexesIsPresent)
{
- context.notify(INFO_UPGRADE_REBUILD_INDEX_DECLINED.get(index), TextOutputCallback.WARNING);
+ context.notify(INFO_UPGRADE_REBUILD_INDEXES_DECLINED.get(indexNames), TextOutputCallback.WARNING);
}
}
@@ -708,7 +708,7 @@
if (backends.isEmpty())
{
logger.debug(INFO_UPGRADE_REBUILD_INDEX_NO_BACKEND_FOUND);
- logger.debug(INFO_UPGRADE_REBUILD_INDEX_DECLINED, indexesToRebuild);
+ logger.debug(INFO_UPGRADE_REBUILD_INDEXES_DECLINED, indexesToRebuild);
context.notifyProgress(pnc.setProgress(100));
return;
}
--
Gitblit v1.10.0