OPENDJ-771 rebuild-index tool should fail when "--clearDegradedState" and "...

Violette Roche-Montane

27.37.2013 b45df99eb2d1240811824f3e6c9aa037829d3994

OPENDJ-771 rebuild-index tool should fail when "--clearDegradedState" and "--rebuildAll" options are specified on the same command line

 opends/src/messages/messages/tools.properties

@@ -2591,8 +2591,8 @@
 with the "-i" option or the "--rebuildAll" option
SEVERE_ERR_REBUILDINDEX_REBUILD_DEGRADED_ERROR_1721=Index "-i" option cannot be \
 specified with the "--rebuildDegraded" option
SEVERE_ERR_REBUILDINDEX_REBUILD_ALL_DEGRADED_ERROR_1722=Option "--rebuildAll" \
 cannot be specified with the "--rebuildDegraded" option
SEVERE_ERR_REBUILDINDEX_REBUILD_ALL_DEGRADED_ERROR_1722=Option "--%s" \
 cannot be specified with the "--%s" option
SEVERE_ERR_CONFIGDS_CANNOT_UPDATE_DIGEST_MD5_FQDN_1733=An error occurred while \
 attempting to update the FQDN for the DIGEST-MD5 SASL mechanism:  %s
INFO_REBUILDINDEX_DESCRIPTION_CLEAR_DEGRADED_STATE_1734=Indicates that indexes do not need \

 opends/src/server/org/opends/server/tools/RebuildIndex.java

@@ -294,7 +294,17 @@

    if(rebuildAll.isPresent() && rebuildDegraded.isPresent())
    {
      Message msg = ERR_REBUILDINDEX_REBUILD_ALL_DEGRADED_ERROR.get();
      Message msg = ERR_REBUILDINDEX_REBUILD_ALL_DEGRADED_ERROR.get("rebuildAll",
          "rebuildDegraded");
      err.println(wrapText(msg, MAX_LINE_WIDTH));
      out.println(argParser.getUsage());
      return 1;
    }

    if(rebuildAll.isPresent() && clearDegradedState.isPresent())
    {
      Message msg = ERR_REBUILDINDEX_REBUILD_ALL_DEGRADED_ERROR.get("rebuildAll",
          "clearDegradedState");
      err.println(wrapText(msg, MAX_LINE_WIDTH));
      out.println(argParser.getUsage());
      return 1;