From 0cedebec3563cee4a0ba3765d5de45889c662112 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 08 Jun 2016 08:32:09 +0000
Subject: [PATCH] OPENDJ-3080 Warnings on schema on startup
---
opendj-server-legacy/src/main/java/org/opends/server/core/SchemaConfigManager.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/SchemaConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/SchemaConfigManager.java
index d08a010..8aa4976 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/SchemaConfigManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/SchemaConfigManager.java
@@ -62,6 +62,9 @@
{
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+ private static final String CORE_SCHEMA_FILE = "00-core.ldif";
+ private static final String RFC_3112_SCHEMA_FILE = "03-rfc3112.ldif";
+
/** The schema that has been parsed from the server configuration. */
private Schema schema;
@@ -379,7 +382,10 @@
{
try
{
- updateSchema(schema, schemaEntry, false);
+ // immediately overwrite these definitions which are already defined in the SDK core schema
+ final boolean overwriteCoreSchemaDefinitions =
+ CORE_SCHEMA_FILE.equals(schemaFile) || RFC_3112_SCHEMA_FILE.equals(schemaFile);
+ updateSchema(schema, schemaEntry, overwriteCoreSchemaDefinitions);
}
catch (DirectoryException e)
{
--
Gitblit v1.10.0