From 6d546ec81795e1ceecb2cabde612d45c16a39a32 Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Thu, 28 Feb 2013 10:16:17 +0000
Subject: [PATCH] OPENDJ-771 rebuild-index tool should fail when "--clearDegradedState" and "--rebuildDegraded" options are specified on the same command line
---
opends/src/server/org/opends/server/tools/RebuildIndex.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/opends/src/server/org/opends/server/tools/RebuildIndex.java b/opends/src/server/org/opends/server/tools/RebuildIndex.java
index d378462..0b2af4b 100644
--- a/opends/src/server/org/opends/server/tools/RebuildIndex.java
+++ b/opends/src/server/org/opends/server/tools/RebuildIndex.java
@@ -286,7 +286,17 @@
if(rebuildDegraded.isPresent() && indexList.isPresent())
{
- Message msg = ERR_REBUILDINDEX_REBUILD_DEGRADED_ERROR.get();
+ Message msg = ERR_REBUILDINDEX_REBUILD_DEGRADED_ERROR.get(
+ "index");
+ err.println(wrapText(msg, MAX_LINE_WIDTH));
+ out.println(argParser.getUsage());
+ return 1;
+ }
+
+ if(rebuildDegraded.isPresent() && clearDegradedState.isPresent())
+ {
+ Message msg = ERR_REBUILDINDEX_REBUILD_DEGRADED_ERROR.get(
+ "clearDegradedState");
err.println(wrapText(msg, MAX_LINE_WIDTH));
out.println(argParser.getUsage());
return 1;
@@ -295,7 +305,7 @@
if(rebuildAll.isPresent() && rebuildDegraded.isPresent())
{
Message msg = ERR_REBUILDINDEX_REBUILD_ALL_DEGRADED_ERROR.get(
- "rebuildAll", "rebuildDegraded");
+ "rebuildDegraded");
err.println(wrapText(msg, MAX_LINE_WIDTH));
out.println(argParser.getUsage());
return 1;
@@ -304,7 +314,7 @@
if(rebuildAll.isPresent() && clearDegradedState.isPresent())
{
Message msg = ERR_REBUILDINDEX_REBUILD_ALL_DEGRADED_ERROR.get(
- "rebuildAll", "clearDegradedState");
+ "clearDegradedState");
err.println(wrapText(msg, MAX_LINE_WIDTH));
out.println(argParser.getUsage());
return 1;
--
Gitblit v1.10.0