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/admin/ads/util/ConnectionUtils.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/ConnectionUtils.java b/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/ConnectionUtils.java
index d629d91..245096d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/ConnectionUtils.java
+++ b/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/ConnectionUtils.java
@@ -18,6 +18,7 @@
import java.io.IOException;
import java.net.ConnectException;
+import java.util.Collections;
import java.util.HashSet;
import java.util.Hashtable;
import java.util.Set;
@@ -605,7 +606,7 @@
public static Set<String> asSetOfString(SearchResultEntry sr, String attrDesc)
{
org.forgerock.opendj.ldap.Attribute attr = sr.getAttribute(attrDesc);
- return attr != null ? attr.parse().asSetOfString() : null;
+ return attr != null ? attr.parse().asSetOfString() : Collections.<String> emptySet();
}
/**
@@ -621,6 +622,6 @@
public static Set<DN> asSetOfDN(SearchResultEntry sr, String attrDesc)
{
org.forgerock.opendj.ldap.Attribute attr = sr.getAttribute(attrDesc);
- return attr != null ? attr.parse().asSetOfDN() : null;
+ return attr != null ? attr.parse().asSetOfDN() : Collections.<DN> emptySet();
}
}
--
Gitblit v1.10.0