From 382b9cfecc5f1d44ae1ade68cae766ada69d9890 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 23 Oct 2014 15:07:11 +0000
Subject: [PATCH] Removed duplicate methods between org.opends.quicksetup.util.Utils and com.forgerock.opendj.cli.Utils. Code cleanup.
---
opendj3-server-dev/src/ads/org/opends/admin/ads/TopologyCache.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/opendj3-server-dev/src/ads/org/opends/admin/ads/TopologyCache.java b/opendj3-server-dev/src/ads/org/opends/admin/ads/TopologyCache.java
index b651e40..a999e21 100644
--- a/opendj3-server-dev/src/ads/org/opends/admin/ads/TopologyCache.java
+++ b/opendj3-server-dev/src/ads/org/opends/admin/ads/TopologyCache.java
@@ -35,9 +35,6 @@
import java.util.Map;
import java.util.Set;
-import org.forgerock.i18n.LocalizableMessage;
-import org.forgerock.i18n.slf4j.LocalizedLogger;
-
import javax.naming.NameNotFoundException;
import javax.naming.NamingEnumeration;
import javax.naming.NamingException;
@@ -46,6 +43,8 @@
import javax.naming.ldap.InitialLdapContext;
import javax.naming.ldap.LdapName;
+import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.admin.ads.ADSContext.ServerProperty;
import org.opends.admin.ads.util.ApplicationTrustManager;
import org.opends.admin.ads.util.ConnectionUtils;
@@ -53,6 +52,8 @@
import org.opends.admin.ads.util.ServerLoader;
import org.opends.quicksetup.util.Utils;
+import static com.forgerock.opendj.cli.Utils.*;
+
import static org.opends.messages.QuickSetupMessages.*;
/**
@@ -76,7 +77,7 @@
private final Set<PreferredConnection> preferredConnections =
new LinkedHashSet<PreferredConnection>();
private final TopologyCacheFilter filter = new TopologyCacheFilter();
- private final static int MULTITHREAD_TIMEOUT = 90 * 1000;
+ private static final int MULTITHREAD_TIMEOUT = 90 * 1000;
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
/**
@@ -441,7 +442,7 @@
break;
case GENERIC_CREATING_CONNECTION:
- if (Utils.isCertificateException(e.getCause()))
+ if (isCertificateException(e.getCause()))
{
exceptionMsgs.add(
INFO_ERROR_READING_CONFIG_LDAP_CERTIFICATE_SERVER.get(
@@ -507,7 +508,7 @@
// This is not a replica, but a replication server. Skip it
continue;
}
- replicaId = new Integer(sid);
+ replicaId = Integer.valueOf(sid);
}
catch (Throwable t)
{
@@ -519,7 +520,7 @@
{
if (Utils.areDnsEqual(dn, replica.getSuffix().getDN())
&& replica.isReplicated()
- && (replica.getReplicationId() == replicaId))
+ && replica.getReplicationId() == replicaId)
{
// This statistic is optional.
String s = ConnectionUtils.getFirstValue(sr,
--
Gitblit v1.10.0