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/BrowserController.java | 24 ++++++------------------
1 files changed, 6 insertions(+), 18 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 f3fc299..afa6800 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
@@ -1538,9 +1538,7 @@
node.getNumSubOrdinates() > 0 || getHasSubOrdinates(entry));
node.setReferral(getReferral(entry));
Set<String> ocValues = asSetOfString(entry, OBJECTCLASS_ATTRIBUTE_TYPE_NAME);
- if (ocValues != null) {
- node.setObjectClassValues(ocValues.toArray(new String[ocValues.size()]));
- }
+ node.setObjectClassValues(ocValues.toArray(new String[0]));
}
int aciCount = getAciCount(entry);
@@ -1916,26 +1914,16 @@
*/
public static String[] getReferral(SearchResultEntry entry) throws NamingException
{
- String[] result = null;
Set<String> values = asSetOfString(entry, OBJECTCLASS_ATTRIBUTE_TYPE_NAME);
- if (values != null)
+ for (String value : values)
{
- for (String value : values)
+ if ("referral".equalsIgnoreCase(value))
{
- boolean isReferral = "referral".equalsIgnoreCase(value);
- if (isReferral)
- {
- Set<String> refValues = asSetOfString(entry, ATTR_REFERRAL_URL);
- if (refValues != null)
- {
- result = new String[refValues.size()];
- refValues.toArray(result);
- }
- break;
- }
+ Set<String> refValues = asSetOfString(entry, ATTR_REFERRAL_URL);
+ return !refValues.isEmpty() ? refValues.toArray(new String[0]) : null;
}
}
- return result;
+ return null;
}
--
Gitblit v1.10.0