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/tasks/TaskTool.java | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/tasks/TaskTool.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/tasks/TaskTool.java
index a61cfc3..949678e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/tasks/TaskTool.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/tasks/TaskTool.java
@@ -26,12 +26,12 @@
*/
package org.opends.server.tools.tasks;
-import static com.forgerock.opendj.cli.Utils.*;
-
import static org.opends.messages.TaskMessages.*;
import static org.opends.messages.ToolMessages.*;
import static org.opends.server.util.StaticUtils.*;
+import static com.forgerock.opendj.cli.Utils.*;
+
import java.io.IOException;
import java.io.PrintStream;
import java.util.Date;
@@ -49,8 +49,10 @@
import org.opends.server.loggers.JDKLogging;
import org.opends.server.tools.LDAPConnection;
import org.opends.server.tools.LDAPConnectionException;
+import org.opends.server.types.InitializationException;
import org.opends.server.types.LDAPException;
import org.opends.server.types.OpenDsException;
+import org.opends.server.util.BuildVersion;
import org.opends.server.util.args.LDAPConnectionArgumentParser;
import com.forgerock.opendj.cli.Argument;
@@ -435,4 +437,16 @@
}
return returnValue;
}
+
+ /**
+ * Checks that binary version and instance version are the same.
+ *
+ * @throws InitializationException
+ * If versions mismatch
+ */
+ protected void checkVersion() throws InitializationException
+ {
+ // FIXME Do not perform this check if the tool is use in remote mode (see OPENDJ-1166)
+ BuildVersion.checkVersionMismatch();
+ }
}
--
Gitblit v1.10.0