From 0ea193c303a1553fbde5a1637d40bfb46c8e5b73 Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Fri, 16 Sep 2016 12:49:16 +0000
Subject: [PATCH] OPENDJ-3302 Do not replicate changes in schema elements related to configuration
---
opendj-server-legacy/src/main/java/org/opends/server/schema/SchemaHandler.java | 12 +++---------
1 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/SchemaHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/SchemaHandler.java
index 21603a1..354cf36 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/SchemaHandler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/SchemaHandler.java
@@ -15,6 +15,8 @@
*/
package org.opends.server.schema;
+import static org.opends.server.util.SchemaUtils.is02ConfigLdif;
+
import static java.util.Collections.emptyList;
import static org.opends.messages.ConfigMessages.*;
import static org.opends.messages.SchemaMessages.*;
@@ -109,7 +111,6 @@
private static final String CORE_SCHEMA_PROVIDER_NAME = "Core Schema";
private static final String CORE_SCHEMA_FILE = "00-core.ldif";
private static final String RFC_3112_SCHEMA_FILE = "03-rfc3112.ldif";
- private static final String CONFIG_SCHEMA_ELEMENTS_FILE = "02-config.ldif";
private static final String CORE_SCHEMA_ELEMENTS_FILE = "00-core.ldif";
private static final AttributeType attributeTypesType = CoreSchema.getAttributeTypesAttributeType();
@@ -569,10 +570,8 @@
{
String definition = v.toString();
String schemaFile = SchemaUtils.parseSchemaFileFromElementDefinition(definition);
- if (is02ConfigLdif(schemaFile))
+ if (SchemaUtils.is02ConfigLdif(schemaFile))
{
- // Do not import the file containing the definitions of the Schema elements used for configuration
- // because these definitions may vary between versions of OpenDJ.
continue;
}
@@ -670,11 +669,6 @@
}
}
- private boolean is02ConfigLdif(String schemaFile)
- {
- return CONFIG_SCHEMA_ELEMENTS_FILE.equals(schemaFile);
- }
-
private <T> void addElementIfNotNull(Collection<T> col, T element)
{
if (element != null)
--
Gitblit v1.10.0