From 609077ed606e3b094e303f298e8dca10567bc3e2 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 05 Aug 2016 18:42:07 +0000
Subject: [PATCH] Partial OPENDJ-2625 Convert all code that uses JNDI to use the SDK instead
---
opendj-server-legacy/src/main/java/org/opends/admin/ads/TopologyCache.java | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/admin/ads/TopologyCache.java b/opendj-server-legacy/src/main/java/org/opends/admin/ads/TopologyCache.java
index c69aecf..085480d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/admin/ads/TopologyCache.java
+++ b/opendj-server-legacy/src/main/java/org/opends/admin/ads/TopologyCache.java
@@ -30,8 +30,6 @@
import java.util.Map;
import java.util.Set;
-import javax.naming.NamingException;
-
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.ldap.DN;
@@ -205,7 +203,7 @@
{
updateReplicas(server, candidateReplicas, updatedReplicas);
}
- catch (NamingException | IOException e)
+ catch (IOException e)
{
server.setLastException(new TopologyCacheException(
TopologyCacheException.Type.GENERIC_READING_SERVER, e));
@@ -457,7 +455,7 @@
private void updateReplicas(ServerDescriptor replicationServer,
Collection<ReplicaDescriptor> candidateReplicas,
Collection<ReplicaDescriptor> updatedReplicas)
- throws NamingException, IOException
+ throws IOException
{
ServerLoader loader = getServerLoader(replicationServer.getAdsProperties());
// only replicas have "server-id", but not replication servers
@@ -505,7 +503,7 @@
}
}
- private void setMissingChanges(ReplicaDescriptor replica, SearchResultEntry sr) throws NamingException
+ private void setMissingChanges(ReplicaDescriptor replica, SearchResultEntry sr)
{
Integer value = asInteger(sr, "missing-changes");
if (value != null)
@@ -522,7 +520,7 @@
}
}
- private void setAgeOfOldestMissingChange(ReplicaDescriptor replica, SearchResultEntry sr) throws NamingException
+ private void setAgeOfOldestMissingChange(ReplicaDescriptor replica, SearchResultEntry sr)
{
String s = firstValueAsString(sr, "approx-older-change-not-synchronized-millis");
if (s != null)
--
Gitblit v1.10.0