From 250c9bdd3c13d06682fd9f06f11ff2e426ac353a Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 29 Mar 2016 10:16:14 +0000
Subject: [PATCH] Prep work for OPENDJ-2803 Migrate Attribute
---
opendj-server-legacy/src/main/java/org/opends/server/config/MultiChoiceConfigAttribute.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/config/MultiChoiceConfigAttribute.java b/opendj-server-legacy/src/main/java/org/opends/server/config/MultiChoiceConfigAttribute.java
index bb0deb5..4d64a78 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/config/MultiChoiceConfigAttribute.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/config/MultiChoiceConfigAttribute.java
@@ -28,6 +28,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
+import org.forgerock.opendj.ldap.AttributeDescription;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.schema.Syntax;
import org.opends.server.core.DirectoryServer;
@@ -694,10 +695,11 @@
for (Attribute a : attributeList)
{
- if (a.hasOptions())
+ AttributeDescription attrDesc = a.getAttributeDescription();
+ if (attrDesc.hasOptions())
{
// This must be the pending value.
- if (a.hasOption(OPTION_PENDING_VALUES))
+ if (attrDesc.hasOption(OPTION_PENDING_VALUES))
{
if (pendingValues != null)
{
--
Gitblit v1.10.0