From ddb249a9885e0348a05978f2d55be67cd8e6f57d Mon Sep 17 00:00:00 2001
From: Ludovic Poitou <ludovic.poitou@forgerock.com>
Date: Fri, 30 Aug 2013 10:02:05 +0000
Subject: [PATCH] More code cleanup and use of interfaces in dsreplication and ADS.
---
opendj-sdk/opends/src/ads/org/opends/admin/ads/TopologyCache.java | 30 ++++++++----------------------
1 files changed, 8 insertions(+), 22 deletions(-)
diff --git a/opendj-sdk/opends/src/ads/org/opends/admin/ads/TopologyCache.java b/opendj-sdk/opends/src/ads/org/opends/admin/ads/TopologyCache.java
index 27603a8..475a322 100644
--- a/opendj-sdk/opends/src/ads/org/opends/admin/ads/TopologyCache.java
+++ b/opendj-sdk/opends/src/ads/org/opends/admin/ads/TopologyCache.java
@@ -23,7 +23,7 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions copyright 2011-2012 ForgeRock AS
+ * Portions copyright 2011-2013 ForgeRock AS
*/
package org.opends.admin.ads;
@@ -77,10 +77,9 @@
new HashSet<ServerDescriptor>();
private final Set<SuffixDescriptor> suffixes =
new HashSet<SuffixDescriptor>();
- private final LinkedHashSet<PreferredConnection> preferredConnections =
+ private final Set<PreferredConnection> preferredConnections =
new LinkedHashSet<PreferredConnection>();
private final TopologyCacheFilter filter = new TopologyCacheFilter();
- private final boolean isMultiThreaded = true;
private final static int MULTITHREAD_TIMEOUT = 90 * 1000;
private static final Logger LOG =
Logger.getLogger(TopologyCache.class.getName());
@@ -125,20 +124,10 @@
for (Map<ServerProperty, Object> serverProperties : adsServers)
{
ServerLoader t = getServerLoader(serverProperties);
- if (isMultiThreaded)
- {
- t.start();
- threadSet.add(t);
- }
- else
- {
- t.run();
- }
+ t.start();
+ threadSet.add(t);
}
- if (isMultiThreaded)
- {
- joinThreadSet(threadSet);
- }
+ joinThreadSet(threadSet);
/*
* Try to consolidate things (even if the data is not complete).
*/
@@ -229,9 +218,6 @@
/**
* Reads the replication monitoring.
- *
- * @throws NamingException if an error occurs reading the replication
- * monitoring.
*/
private void readReplicationMonitoring()
{
@@ -300,7 +286,7 @@
*
* @param cnx the list of preferred connections.
*/
- public void setPreferredConnections(LinkedHashSet<PreferredConnection> cnx)
+ public void setPreferredConnections(Set<PreferredConnection> cnx)
{
preferredConnections.clear();
preferredConnections.addAll(cnx);
@@ -421,12 +407,12 @@
*
* @return a set of error messages encountered in the TopologyCache.
*/
- public LinkedHashSet<Message> getErrorMessages()
+ public Set<Message> getErrorMessages()
{
Set<TopologyCacheException> exceptions =
new HashSet<TopologyCacheException>();
Set<ServerDescriptor> theServers = getServers();
- LinkedHashSet<Message> exceptionMsgs = new LinkedHashSet<Message>();
+ Set<Message> exceptionMsgs = new LinkedHashSet<Message>();
for (ServerDescriptor server : theServers)
{
TopologyCacheException e = server.getLastException();
--
Gitblit v1.10.0