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/guitools/controlpanel/browser/BrowserController.java | 33 +++++++++++----------------------
1 files changed, 11 insertions(+), 22 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/BrowserController.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/BrowserController.java
index 80468dd..b42ace8 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/BrowserController.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/BrowserController.java
@@ -39,6 +39,7 @@
import javax.swing.tree.TreeNode;
import javax.swing.tree.TreePath;
+import org.forgerock.i18n.LocalizedIllegalArgumentException;
import org.forgerock.opendj.ldap.DN;
import org.forgerock.opendj.ldap.Entry;
import org.forgerock.opendj.ldap.EntryNotFoundException;
@@ -1674,7 +1675,14 @@
*/
private static int getNumSubOrdinates(Entry entry)
{
- return toInt(firstValueAsString(entry, NUMSUBORDINATES_ATTR));
+ try
+ {
+ return entry.parseAttribute(NUMSUBORDINATES_ATTR).asInteger(0);
+ }
+ catch (LocalizedIllegalArgumentException e)
+ {
+ return 0;
+ }
}
/**
@@ -1687,27 +1695,8 @@
*/
public static boolean getHasSubOrdinates(Entry entry)
{
- String v = firstValueAsString(entry, HASSUBORDINATES_ATTR);
- if (v != null) {
- return "true".equalsIgnoreCase(v);
- }
- return getNumSubOrdinates(entry) > 0;
- }
-
- private static int toInt(String v)
- {
- if (v == null)
- {
- return 0;
- }
- try
- {
- return Integer.parseInt(v);
- }
- catch (NumberFormatException x)
- {
- return 0;
- }
+ Boolean val = entry.parseAttribute(HASSUBORDINATES_ATTR).asBoolean();
+ return val != null ? val : getNumSubOrdinates(entry) > 0;
}
/**
--
Gitblit v1.10.0