From 8c2fb347d05648fa8e6ee41abc86cc658b8a3f70 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 27 May 2016 12:31:05 +0000
Subject: [PATCH] OPENDJ-2797 When adding matching rule use, also set their schema file
---
opendj-server-legacy/src/main/java/org/opends/server/backends/SchemaBackend.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 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 28fdbfb..040e678 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
@@ -2441,15 +2441,15 @@
// Otherwise, we're replacing an existing matching rule use.
if (existingMRU == null)
{
- schema.registerMatchingRuleUse(matchingRuleUse, false);
- addNewSchemaElement(modifiedSchemaFiles, new ServerSchemaElement(matchingRuleUse));
+ String schemaFile = addNewSchemaElement(modifiedSchemaFiles, new ServerSchemaElement(matchingRuleUse));
+ schema.registerMatchingRuleUse(matchingRuleUse, schemaFile, false);
}
else
{
schema.deregisterMatchingRuleUse(existingMRU);
- schema.registerMatchingRuleUse(matchingRuleUse, false);
- replaceExistingSchemaElement(modifiedSchemaFiles, new ServerSchemaElement(matchingRuleUse),
- new ServerSchemaElement(existingMRU));
+ String schemaFile = replaceExistingSchemaElement(
+ modifiedSchemaFiles, new ServerSchemaElement(matchingRuleUse), new ServerSchemaElement(existingMRU));
+ schema.registerMatchingRuleUse(matchingRuleUse, schemaFile, false);
}
}
--
Gitblit v1.10.0