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/ServerDescriptor.java | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/admin/ads/ServerDescriptor.java b/opendj-server-legacy/src/main/java/org/opends/admin/ads/ServerDescriptor.java
index 5d11a41..4f3a630 100644
--- a/opendj-server-legacy/src/main/java/org/opends/admin/ads/ServerDescriptor.java
+++ b/opendj-server-legacy/src/main/java/org/opends/admin/ads/ServerDescriptor.java
@@ -790,8 +790,6 @@
String backendId = firstValueAsString(sr, "ds-cfg-backend-id");
if (!isConfigBackend(backendId) || isSchemaBackend(backendId))
{
- Set<DN> baseDns = asSetOfDN(sr, "ds-cfg-base-dn");
-
Set<String> entries;
if (cacheFilter.searchMonitoringInformation())
{
@@ -803,6 +801,7 @@
}
Set<ReplicaDescriptor> replicas = desc.getReplicas();
+ Set<DN> baseDns = asSetOfDN(sr, "ds-cfg-base-dn");
for (DN baseDn : baseDns)
{
if (isAddReplica(cacheFilter, baseDn))
--
Gitblit v1.10.0