From 559630336f89193462e148ddf2beeaac0987720b Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Mon, 30 May 2016 10:43:12 +0000
Subject: [PATCH] OPENDJ-2987 Extensible object class should not block removing an attribute type

---
 opendj-server-legacy/src/main/java/org/opends/server/backends/SchemaBackend.java |    2 +-
 1 files changed, 1 insertions(+), 1 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 2f59cf4..71d7996 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
@@ -1353,7 +1353,7 @@
     for (ObjectClass oc : schema.getObjectClasses())
     {
       if (oc.getDeclaredRequiredAttributes().contains(removeType) ||
-          oc.getDeclaredOptionalAttributes().contains(removeType))
+          (oc.getDeclaredOptionalAttributes().contains(removeType) && !oc.isExtensible()))
       {
         LocalizableMessage message = ERR_SCHEMA_MODIFY_REMOVE_AT_IN_OC.get(
             removeType.getNameOrOID(), oc.getNameOrOID());

--
Gitblit v1.10.0