From a85e9d72f0bceb3fff1d05330f5d4434a1f05cce Mon Sep 17 00:00:00 2001
From: Fabio Pistolesi <fabio.pistolesi@forgerock.com>
Date: Fri, 20 May 2016 15:41:45 +0000
Subject: [PATCH] OPENDJ-2961 Print human readable list of index names to rebuild
---
opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeTasks.java | 7 ++++---
1 files changed, 4 insertions(+), 3 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 3cd36b9..8af823d 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
@@ -19,6 +19,7 @@
import static javax.security.auth.callback.ConfirmationCallback.YES;
import static javax.security.auth.callback.TextOutputCallback.*;
+import static org.forgerock.util.Utils.joinAsString;
import static org.opends.messages.ToolMessages.*;
import static org.opends.server.tools.upgrade.FileManager.copy;
import static org.opends.server.tools.upgrade.UpgradeUtils.*;
@@ -48,7 +49,6 @@
import org.forgerock.opendj.ldap.requests.Requests;
import org.forgerock.opendj.ldap.requests.SearchRequest;
import org.forgerock.opendj.ldif.EntryReader;
-import org.forgerock.util.Utils;
import org.opends.server.backends.pluggable.spi.TreeName;
import org.opends.server.tools.JavaPropertiesTool;
import org.opends.server.tools.RebuildIndex;
@@ -539,7 +539,7 @@
final StringBuilder sb = new StringBuilder();
sb.append(condition).append(" = ").append(shouldPerformUpgradeTasks).append('\n');
sb.append('[');
- Utils.joinAsString(sb, "\n", (Object[]) tasks);
+ joinAsString(sb, "\n", (Object[]) tasks);
sb.append(']');
return sb.toString();
}
@@ -640,7 +640,8 @@
{
if (!isRebuildAllIndexesIsPresent)
{
- context.notify(INFO_UPGRADE_REBUILD_INDEXES_DECLINED.get(indexNames), TextOutputCallback.WARNING);
+ context.notify(INFO_UPGRADE_REBUILD_INDEXES_DECLINED.get(joinAsString(", ", indexNames)),
+ TextOutputCallback.WARNING);
}
}
--
Gitblit v1.10.0