From 3e7100797afc9068d10990f57b46e868ff812966 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 28 Oct 2016 14:18:44 +0000
Subject: [PATCH] Use the new Entry.parseAttribute() method
---
opendj-server-legacy/src/main/java/org/opends/admin/ads/TopologyCache.java | 22 +++++++++-------------
1 files changed, 9 insertions(+), 13 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 1ed6bf9..06c7432 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
@@ -31,6 +31,7 @@
import java.util.Set;
import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.i18n.LocalizedIllegalArgumentException;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.ldap.DN;
import org.forgerock.opendj.ldap.EntryNotFoundException;
@@ -49,7 +50,6 @@
import static org.forgerock.opendj.ldap.SearchScope.*;
import static org.forgerock.opendj.ldap.requests.Requests.*;
-import static org.opends.admin.ads.util.ConnectionUtils.*;
import static org.opends.messages.QuickSetupMessages.*;
/**
@@ -458,7 +458,7 @@
{
SearchResultEntry sr = entryReader.readEntry();
- final DN dn = DN.valueOf(firstValueAsString(sr, "domain-name"));
+ final DN dn = sr.parseAttribute("domain-name").asDN();
int replicaId = -1;
try
{
@@ -509,18 +509,14 @@
private void setAgeOfOldestMissingChange(ReplicaDescriptor replica, SearchResultEntry sr)
{
- String s = firstValueAsString(sr, "approx-older-change-not-synchronized-millis");
- if (s != null)
+ try
{
- try
- {
- replica.setAgeOfOldestMissingChange(Long.valueOf(s));
- }
- catch (Throwable t)
- {
- logger.warn(LocalizableMessage.raw(
- "Unexpected error reading age of oldest change: " + t, t));
- }
+ replica.setAgeOfOldestMissingChange(
+ sr.parseAttribute("approx-older-change-not-synchronized-millis").asLong());
+ }
+ catch (LocalizedIllegalArgumentException t)
+ {
+ logger.warn(LocalizableMessage.raw("Unexpected error reading age of oldest change: " + t, t));
}
}
--
Gitblit v1.10.0