From 0149a25c5a0aea9d63e409cb7a9492eaaa09d956 Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Mon, 30 May 2016 10:43:13 +0000
Subject: [PATCH] OPENDJ-2987 Replace an attribute type in Schema in one step to prevent error when validating schema
---
opendj-server-legacy/src/main/java/org/opends/server/backends/SchemaBackend.java | 5 +----
1 files changed, 1 insertions(+), 4 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 242eada..849d69c 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
@@ -1161,12 +1161,9 @@
}
else
{
- schema.deregisterAttributeType(existingType);
-
String schemaFile = replaceExistingSchemaElement(
modifiedSchemaFiles, new SomeSchemaElement(attributeType), new SomeSchemaElement(existingType));
- schema.registerAttributeType(attributeType, schemaFile, false);
- schema.rebuildDependentElements(existingType);
+ schema.replaceAttributeType(attributeType, existingType, schemaFile);
}
}
--
Gitblit v1.10.0