From 63a649a84464e460244b3e785727f405a9f0beb2 Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Fri, 06 Dec 2013 14:23:02 +0000
Subject: [PATCH] CR-2675 OPENDJ-1241 Server does not start after upgrade - Part I - fixed Rebuild Index
---
opends/src/server/org/opends/server/tools/RebuildIndex.java | 14 +++++++++++---
1 files changed, 11 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 1cf7ab7..3bca14b 100644
--- a/opends/src/server/org/opends/server/tools/RebuildIndex.java
+++ b/opends/src/server/org/opends/server/tools/RebuildIndex.java
@@ -331,7 +331,11 @@
final DirectoryServer directoryServer = DirectoryServer.getInstance();
if (initializeServer)
{
- initializeServer(directoryServer, out, err);
+ final int init = initializeServer(directoryServer, out, err);
+ if (init != 0)
+ {
+ return init;
+ }
setErrorAndDebugLogPublisher(out, err);
}
@@ -432,7 +436,7 @@
* @param err
* The output stream to use for standard error, or {@code null} if
* standard error is not needed.
- * @return The error code.
+ * @return The result code.
*/
private int initializeServer(final DirectoryServer directoryServer,
final PrintStream out, final PrintStream err)
@@ -765,7 +769,11 @@
final DirectoryServer directoryServer = DirectoryServer.getInstance();
if (initializeServer)
{
- initializeServer(directoryServer, out, out);
+ final int init = initializeServer(directoryServer, out, out);
+ if (init != 0)
+ {
+ return init;
+ }
}
for (final String dn : baseDNString.getValues())
--
Gitblit v1.10.0