From 1a9cf8eb5d85975f405a129743de69e56a91334e Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Fri, 01 Jul 2016 12:53:43 +0000
Subject: [PATCH] OPENDJ-2956 Issue warnings during schema validation of a name form if it references obsolete elements
---
opendj-server-legacy/src/main/java/org/opends/server/backends/SchemaBackend.java | 30 ------------------------------
1 files changed, 0 insertions(+), 30 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 0bd06de..26e73d6 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
@@ -1405,36 +1405,6 @@
Set<String> modifiedSchemaFiles)
throws DirectoryException
{
- // Make sure that the new name form doesn't reference an objectclass
- // or attributes that are marked OBSOLETE.
- ObjectClass structuralClass = nameForm.getStructuralClass();
- if (structuralClass.isObsolete())
- {
- LocalizableMessage message = ERR_SCHEMA_MODIFY_NF_OC_OBSOLETE.get(
- nameForm.getNameOrOID(), structuralClass.getNameOrOID());
- throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
- }
-
- for (AttributeType at : nameForm.getRequiredAttributes())
- {
- if (at.isObsolete())
- {
- LocalizableMessage message = ERR_SCHEMA_MODIFY_NF_OBSOLETE_REQUIRED_ATTR.get(
- nameForm.getNameOrOID(), at.getNameOrOID());
- throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION, message);
- }
- }
-
- for (AttributeType at : nameForm.getOptionalAttributes())
- {
- if (at.isObsolete())
- {
- LocalizableMessage message = ERR_SCHEMA_MODIFY_NF_OBSOLETE_OPTIONAL_ATTR.get(
- nameForm.getNameOrOID(), at.getNameOrOID());
- throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION, message);
- }
- }
-
// If there is no existing class, then we're adding a new name form.
// Otherwise, we're replacing an existing one.
if (!schema.hasNameForm(nameForm.getNameOrOID()))
--
Gitblit v1.10.0