From 2250643bd27e47583d10cb33964693c6b44450d9 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 04 Apr 2016 13:38:34 +0000
Subject: [PATCH] Fix failing tests and cleanup
---
opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciHandler.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciHandler.java
index 2273259..953d0ac 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciHandler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciHandler.java
@@ -20,6 +20,7 @@
import java.util.LinkedList;
import java.util.List;
import java.util.SortedSet;
+import java.util.TreeSet;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.LocalizedIllegalArgumentException;
@@ -1104,8 +1105,12 @@
{
try
{
- final SortedSet<Aci> globalAcis = configuration.getGlobalACI();
- if (globalAcis != null)
+ final SortedSet<Aci> globalAcis = new TreeSet<Aci>();
+ for (String value : configuration.getGlobalACI())
+ {
+ globalAcis.add(Aci.decode(ByteString.valueOfUtf8(value), DN.rootDN()));
+ }
+ if (!globalAcis.isEmpty())
{
aciList.addAci(DN.rootDN(), globalAcis);
logger.debug(INFO_ACI_ADD_LIST_GLOBAL_ACIS, globalAcis.size());
--
Gitblit v1.10.0