From 1b570922c1772fde4fbd44855453dbd86bb9e276 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 29 Mar 2016 16:17:05 +0000
Subject: [PATCH] Prep work for OPENDJ-2803 Migrate Attribute
---
opendj-server-legacy/src/main/java/org/opends/server/config/DNConfigAttribute.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/config/DNConfigAttribute.java b/opendj-server-legacy/src/main/java/org/opends/server/config/DNConfigAttribute.java
index da0dd9c..34e528e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/config/DNConfigAttribute.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/config/DNConfigAttribute.java
@@ -711,7 +711,7 @@
{
// We cannot have multiple pending value sets.
LocalizableMessage message =
- ERR_CONFIG_ATTR_MULTIPLE_PENDING_VALUE_SETS.get(a.getName());
+ ERR_CONFIG_ATTR_MULTIPLE_PENDING_VALUE_SETS.get(attrDesc.getNameOrOID());
throw new ConfigException(message);
}
@@ -721,7 +721,7 @@
if (isRequired())
{
// This is illegal -- it must have a value.
- throw new ConfigException(ERR_CONFIG_ATTR_IS_REQUIRED.get(a.getName()));
+ throw new ConfigException(ERR_CONFIG_ATTR_IS_REQUIRED.get(attrDesc.getNameOrOID()));
}
// This is fine. The pending value set can be empty.
pendingValues = new ArrayList<>(0);
@@ -732,7 +732,7 @@
if (numValues > 1 && !isMultiValued())
{
// This is illegal -- the attribute is single-valued.
- throw new ConfigException(ERR_CONFIG_ATTR_SET_VALUES_IS_SINGLE_VALUED.get(a.getName()));
+ throw new ConfigException(ERR_CONFIG_ATTR_SET_VALUES_IS_SINGLE_VALUED.get(attrDesc.getNameOrOID()));
}
pendingValues = new ArrayList<>(numValues);
@@ -760,7 +760,7 @@
// This is illegal -- only the pending option is allowed for
// configuration attributes.
throw new ConfigException(
- ERR_CONFIG_ATTR_OPTIONS_NOT_ALLOWED.get(a.getName()));
+ ERR_CONFIG_ATTR_OPTIONS_NOT_ALLOWED.get(attrDesc.getNameOrOID()));
}
}
else
@@ -770,7 +770,7 @@
{
// We cannot have multiple active value sets.
throw new ConfigException(
- ERR_CONFIG_ATTR_MULTIPLE_ACTIVE_VALUE_SETS.get(a.getName()));
+ ERR_CONFIG_ATTR_MULTIPLE_ACTIVE_VALUE_SETS.get(attrDesc.getNameOrOID()));
}
@@ -779,7 +779,7 @@
if (isRequired())
{
// This is illegal -- it must have a value.
- throw new ConfigException(ERR_CONFIG_ATTR_IS_REQUIRED.get(a.getName()));
+ throw new ConfigException(ERR_CONFIG_ATTR_IS_REQUIRED.get(attrDesc.getNameOrOID()));
}
// This is fine. The active value set can be empty.
activeValues = new ArrayList<>(0);
@@ -790,7 +790,7 @@
if (numValues > 1 && !isMultiValued())
{
// This is illegal -- the attribute is single-valued.
- throw new ConfigException(ERR_CONFIG_ATTR_SET_VALUES_IS_SINGLE_VALUED.get(a.getName()));
+ throw new ConfigException(ERR_CONFIG_ATTR_SET_VALUES_IS_SINGLE_VALUED.get(attrDesc.getNameOrOID()));
}
activeValues = new ArrayList<>(numValues);
--
Gitblit v1.10.0