From 9c3ca8d7a4868b519eb7333b7790fb1b910588cb Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 03 Aug 2016 09:43:06 +0000
Subject: [PATCH] ConnectionUtils.asSetOf*() should never return null

---
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/NodeRefresher.java |   12 ++++--------
 1 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/NodeRefresher.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/NodeRefresher.java
index 88c065a..e7b1a2e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/NodeRefresher.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/NodeRefresher.java
@@ -27,7 +27,6 @@
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Set;
 
 import javax.naming.InterruptedNamingException;
 import javax.naming.NameNotFoundException;
@@ -996,14 +995,11 @@
    */
   private static boolean isReferralEntry(SearchResultEntry entry) throws NamingException
   {
-    Set<String> ocValues = asSetOfString(entry, "objectClass");
-    if (ocValues != null) {
-      for (String value : ocValues)
+    for (String value : asSetOfString(entry, "objectClass"))
+    {
+      if ("referral".equalsIgnoreCase(value))
       {
-        boolean isReferral = "referral".equalsIgnoreCase(value);
-        if (isReferral) {
-          return firstValueAsString(entry, "ref") != null;
-        }
+        return firstValueAsString(entry, "ref") != null;
       }
     }
     return false;

--
Gitblit v1.10.0