From 8ca638034127ea5c5911ebcd13ff33e742e06784 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 04 Aug 2016 13:23:02 +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/guitools/controlpanel/browser/BrowserController.java | 17 +++++------------
1 files changed, 5 insertions(+), 12 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 138d236..6d798a7 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
@@ -48,6 +48,7 @@
import javax.swing.tree.TreeNode;
import javax.swing.tree.TreePath;
+import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.DN;
import org.forgerock.opendj.ldap.responses.SearchResultEntry;
import org.opends.admin.ads.ADSContext;
@@ -1792,12 +1793,8 @@
*/
private static int getNumSubOrdinates(CustomSearchResult entry)
{
- List<Object> vs = entry.getAttributeValues(NUMSUBORDINATES_ATTR);
- String v = null;
- if (vs != null && !vs.isEmpty())
- {
- v = vs.get(0).toString();
- }
+ List<ByteString> vs = entry.getAttributeValues(NUMSUBORDINATES_ATTR);
+ String v = !vs.isEmpty() ? vs.get(0).toString() : null;
return toInt(v);
}
@@ -1827,12 +1824,8 @@
*/
public static boolean getHasSubOrdinates(CustomSearchResult entry)
{
- List<Object> vs = entry.getAttributeValues(HASSUBORDINATES_ATTR);
- String v = null;
- if (vs != null && !vs.isEmpty())
- {
- v = vs.get(0).toString();
- }
+ List<ByteString> vs = entry.getAttributeValues(HASSUBORDINATES_ATTR);
+ String v = !vs.isEmpty() ? vs.get(0).toString() : null;
if (v != null)
{
return "true".equalsIgnoreCase(v);
--
Gitblit v1.10.0