From a3529e8d0ca9206b9bef2c6dba418ca20ad06e8a Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Tue, 01 Apr 2014 09:11:13 +0000
Subject: [PATCH] OPENDJ-1303 Split out CLI support from opendj-ldap-toolkit into a separate Maven module, "opendj-cli" - Replaced ConnectionUtils.getDefaultLDAPTimeout() by CliConstants.DEFAULT_LDAP_CONNECT_TIMEOUT; - LDAPManagementContextFactory.java : code cleanup - removed unused code.
---
opendj3-server-dev/src/server/org/opends/server/util/BuildVersion.java | 33 ++++++++-------------------------
1 files changed, 8 insertions(+), 25 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/util/BuildVersion.java b/opendj3-server-dev/src/server/org/opends/server/util/BuildVersion.java
index 24baabc..cc50943 100644
--- a/opendj3-server-dev/src/server/org/opends/server/util/BuildVersion.java
+++ b/opendj3-server-dev/src/server/org/opends/server/util/BuildVersion.java
@@ -30,6 +30,7 @@
import static org.opends.messages.ToolMessages.ERR_BUILDVERSION_MALFORMED;
import static org.opends.messages.ToolMessages.ERR_BUILDVERSION_MISMATCH;
import static org.opends.server.config.ConfigConstants.CONFIG_DIR_NAME;
+import static org.forgerock.util.Utils.closeSilently;
import java.io.BufferedReader;
import java.io.File;
@@ -107,17 +108,7 @@
}
finally
{
- if (reader != null)
- {
- try
- {
- reader.close();
- }
- catch (final Exception e)
- {
- // Ignore.
- }
- }
+ closeSilently(reader);
}
}
@@ -187,9 +178,7 @@
this.rev = rev;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public int compareTo(final BuildVersion version)
{
if (major == version.major)
@@ -224,9 +213,7 @@
return 1;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public boolean equals(final Object obj)
{
if (this == obj)
@@ -236,8 +223,8 @@
else if (obj instanceof BuildVersion)
{
final BuildVersion other = (BuildVersion) obj;
- return (major == other.major) && (minor == other.minor)
- && (point == other.point) && (rev == other.rev);
+ return major == other.major && minor == other.minor
+ && point == other.point && rev == other.rev;
}
else
{
@@ -285,18 +272,14 @@
return rev;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public int hashCode()
{
return Arrays.hashCode(new int[] { major, minor, point, (int) (rev >>> 32),
(int) (rev & 0xFFFFL) });
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public String toString()
{
final StringBuilder builder = new StringBuilder();
--
Gitblit v1.10.0