From 12034b057af590521acaf1d5dfa40725f0be842d Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Tue, 09 Jun 2015 10:44:24 +0000
Subject: [PATCH] OPENDJ-1166-checkpoint Improve tools behavior
---
opendj-server-legacy/src/main/java/org/opends/server/tools/RestoreDB.java | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/RestoreDB.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/RestoreDB.java
index e6481d7..5c67047 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/RestoreDB.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/RestoreDB.java
@@ -26,13 +26,13 @@
*/
package org.opends.server.tools;
-import static com.forgerock.opendj.cli.ArgumentConstants.*;
-import static com.forgerock.opendj.cli.Utils.*;
-
import static org.opends.messages.ToolMessages.*;
import static org.opends.server.config.ConfigConstants.*;
import static org.opends.server.util.StaticUtils.*;
+import static com.forgerock.opendj.cli.ArgumentConstants.*;
+import static com.forgerock.opendj.cli.Utils.*;
+
import java.io.OutputStream;
import java.io.PrintStream;
import java.text.DateFormat;
@@ -62,8 +62,14 @@
import org.opends.server.protocols.ldap.LDAPAttribute;
import org.opends.server.tasks.RestoreTask;
import org.opends.server.tools.tasks.TaskTool;
-import org.opends.server.types.*;
-import org.opends.server.util.BuildVersion;
+import org.opends.server.types.BackupDirectory;
+import org.opends.server.types.BackupInfo;
+import org.opends.server.types.DN;
+import org.opends.server.types.DirectoryException;
+import org.opends.server.types.InitializationException;
+import org.opends.server.types.NullOutputStream;
+import org.opends.server.types.RawAttribute;
+import org.opends.server.types.RestoreConfig;
import org.opends.server.util.args.LDAPConnectionArgumentParser;
import com.forgerock.opendj.cli.Argument;
@@ -271,7 +277,7 @@
// Checks the version - if upgrade required, the tool is unusable
try
{
- BuildVersion.checkVersionMismatch();
+ checkVersion();
}
catch (InitializationException e)
{
--
Gitblit v1.10.0