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/backends/SchemaBackend.java | 18 +++++++-----------
1 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/SchemaBackend.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/SchemaBackend.java
index 224dba4..bb6c3ec 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/SchemaBackend.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/SchemaBackend.java
@@ -925,9 +925,8 @@
else
{
LocalizableMessage message =
- ERR_SCHEMA_MODIFY_UNSUPPORTED_ATTRIBUTE_TYPE.get(a.getName());
- throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM,
- message);
+ ERR_SCHEMA_MODIFY_UNSUPPORTED_ATTRIBUTE_TYPE.get(a.getAttributeDescription().getNameOrOID());
+ throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
}
break;
@@ -937,9 +936,8 @@
if (a.isEmpty())
{
LocalizableMessage message =
- ERR_SCHEMA_MODIFY_DELETE_NO_VALUES.get(a.getName());
- throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM,
- message);
+ ERR_SCHEMA_MODIFY_DELETE_NO_VALUES.get(a.getAttributeDescription().getNameOrOID());
+ throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
}
if (at.equals(attributeTypesType))
@@ -1084,9 +1082,8 @@
else
{
LocalizableMessage message =
- ERR_SCHEMA_MODIFY_UNSUPPORTED_ATTRIBUTE_TYPE.get(a.getName());
- throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM,
- message);
+ ERR_SCHEMA_MODIFY_UNSUPPORTED_ATTRIBUTE_TYPE.get(a.getAttributeDescription().getNameOrOID());
+ throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
}
break;
@@ -1181,8 +1178,7 @@
LocalizableMessage message =
ERR_SCHEMA_MODIFY_CANNOT_WRITE_NEW_SCHEMA.get(getExceptionMessage(e));
- throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
- message, e);
+ throw new DirectoryException(DirectoryServer.getServerErrorResultCode(), message, e);
}
finally
{
--
Gitblit v1.10.0