From 2e08d2c0e9bede644be993ddaa28157c9f156c10 Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Tue, 07 May 2013 13:50:59 +0000
Subject: [PATCH] svn merge https://svn.forgerock.org/opendj/trunk/opends@8851 https://svn.forgerock.org/opendj/branches/native-packaging@8851 .
---
opends/src/server/org/opends/server/tools/RebuildIndex.java | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/opends/src/server/org/opends/server/tools/RebuildIndex.java b/opends/src/server/org/opends/server/tools/RebuildIndex.java
index e6ef057..c8d113f 100644
--- a/opends/src/server/org/opends/server/tools/RebuildIndex.java
+++ b/opends/src/server/org/opends/server/tools/RebuildIndex.java
@@ -29,6 +29,8 @@
import org.opends.messages.Message;
import static org.opends.server.util.StaticUtils.wrapText;
+
+import org.opends.server.util.BuildVersion;
import org.opends.server.util.args.ArgumentException;
import org.opends.server.util.args.BooleanArgument;
import org.opends.server.util.args.LDAPConnectionArgumentParser;
@@ -246,7 +248,6 @@
return 1;
}
-
// If we should just display usage or version information,
// then print it and exit.
if (argParser.usageOrVersionDisplayed())
@@ -254,9 +255,6 @@
return 0;
}
-
-
-
// If no arguments were provided, then display usage information and exit.
int numArgs = args.length;
if (numArgs == 0)
@@ -265,7 +263,6 @@
return 1;
}
-
if (indexList.getValues().size() <= 0 && !rebuildAll.isPresent()
&& !rebuildDegraded.isPresent())
{
@@ -320,6 +317,17 @@
return 1;
}
+ // Checks the version - if upgrade required, the tool is unusable
+ try
+ {
+ BuildVersion.checkVersionMismatch();
+ }
+ catch (InitializationException e)
+ {
+ err.println(wrapText(e.getMessage(), MAX_LINE_WIDTH));
+ return 1;
+ }
+
return process(argParser, initializeServer, out, err);
}
--
Gitblit v1.10.0