From 73fb5702321f67764e325edfd4e44cebf78786e7 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 03 Mar 2014 14:31:57 +0000
Subject: [PATCH] OPENDJ-1308 Migrate schema support
---
opendj3-server-dev/src/server/org/opends/server/backends/SchemaBackend.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/SchemaBackend.java b/opendj3-server-dev/src/server/org/opends/server/backends/SchemaBackend.java
index d1c890c..8cf2f4a 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/SchemaBackend.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/SchemaBackend.java
@@ -1920,7 +1920,7 @@
if (mru.getAttributes().contains(removeType))
{
LocalizableMessage message = ERR_SCHEMA_MODIFY_REMOVE_AT_IN_MR_USE.get(
- removeType.getNameOrOID(), mru.getName());
+ removeType.getNameOrOID(), mru.getNameOrOID());
throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
}
}
@@ -3090,9 +3090,9 @@
{
LocalizableMessage message =
ERR_SCHEMA_MODIFY_MULTIPLE_CONFLICTS_FOR_ADD_MR_USE.get(
- matchingRuleUse.getName(),
- existingMRU.getName(),
- mru.getName());
+ matchingRuleUse.getNameOrOID(),
+ existingMRU.getNameOrOID(),
+ mru.getNameOrOID());
throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM,
message);
}
@@ -3112,15 +3112,15 @@
if ((existingMRUForRule != null) && (existingMRUForRule != existingMRU))
{
LocalizableMessage message = ERR_SCHEMA_MODIFY_MR_CONFLICT_FOR_ADD_MR_USE.
- get(matchingRuleUse.getName(), matchingRule.getNameOrOID(),
- existingMRUForRule.getName());
+ get(matchingRuleUse.getNameOrOID(), matchingRule.getNameOrOID(),
+ existingMRUForRule.getNameOrOID());
throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
}
if (matchingRule.isObsolete())
{
LocalizableMessage message = ERR_SCHEMA_MODIFY_MRU_OBSOLETE_MR.get(
- matchingRuleUse.getName(), matchingRule.getNameOrOID());
+ matchingRuleUse.getNameOrOID(), matchingRule.getNameOrOID());
throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION, message);
}
@@ -3132,13 +3132,13 @@
if (! schema.hasAttributeType(at.getOID()))
{
LocalizableMessage message = ERR_SCHEMA_MODIFY_MRU_UNDEFINED_ATTR.get(
- matchingRuleUse.getName(), at.getNameOrOID());
+ matchingRuleUse.getNameOrOID(), at.getNameOrOID());
throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
}
else if (at.isObsolete())
{
LocalizableMessage message = ERR_SCHEMA_MODIFY_MRU_OBSOLETE_ATTR.get(
- matchingRuleUse.getName(), matchingRule.getNameOrOID());
+ matchingRuleUse.getNameOrOID(), matchingRule.getNameOrOID());
throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION, message);
}
}
@@ -3236,7 +3236,7 @@
if ((removeMRU == null) || (! removeMRU.equals(matchingRuleUse)))
{
LocalizableMessage message = ERR_SCHEMA_MODIFY_REMOVE_NO_SUCH_MR_USE.get(
- matchingRuleUse.getName());
+ matchingRuleUse.getNameOrOID());
throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
}
--
Gitblit v1.10.0