From edb7b32eaa2db4a171496d30ed3293bfa06b30c8 Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Tue, 11 Feb 2014 13:36:41 +0000
Subject: [PATCH] Checkpoint commit for OPENDJ-1303 - added DEFAULT_LDAP_CONNECT_TIMEOUT to constants. - added ClientException, merge it with CLIException. Replaced CLIException calls. (CLIException will disappear soon) - Console application : errors,warnings should be displayed in stdout if interactive mode is enabled. - added unit tests. - removed closeIfNotNull / replaced it by Utils.closeSilently
---
opendj-cli/src/main/java/com/forgerock/opendj/cli/Utils.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/Utils.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/Utils.java
index c1cbd2e..0c48ba0 100644
--- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/Utils.java
+++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/Utils.java
@@ -332,14 +332,15 @@
/**
* Checks that the java version.
*
- * @throws CLIException
+ * @throws ClientException
* If the java version we are running on is not compatible.
*/
- public static void checkJavaVersion() throws CLIException {
+ public static void checkJavaVersion() throws ClientException {
final String version = System.getProperty("java.specification.version");
if (!(Float.valueOf(version) >= 1.6)) {
final String javaBin = System.getProperty("java.home") + File.separator + "bin" + File.separator + "java";
- throw new CLIException(ERR_INCOMPATIBLE_JAVA_VERSION.get("1.6", version, javaBin), null);
+ throw new ClientException(ReturnCode.JAVA_VERSION_INCOMPATIBLE, ERR_INCOMPATIBLE_JAVA_VERSION.get("1.6",
+ version, javaBin), null);
}
}
--
Gitblit v1.10.0