From 99480fcbcb68be6a357f6218668feab697e1a93d Mon Sep 17 00:00:00 2001
From: gbellato <gbellato@localhost>
Date: Tue, 07 Jul 2009 14:55:26 +0000
Subject: [PATCH] Fix for 4096 MonitorMsg is not compatible with replication version
---
opends/src/server/org/opends/server/backends/SchemaBackend.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/opends/src/server/org/opends/server/backends/SchemaBackend.java b/opends/src/server/org/opends/server/backends/SchemaBackend.java
index 429c36d..056da63 100644
--- a/opends/src/server/org/opends/server/backends/SchemaBackend.java
+++ b/opends/src/server/org/opends/server/backends/SchemaBackend.java
@@ -122,6 +122,7 @@
private static final String CONFIG_SCHEMA_ELEMENTS_FILE = "02-config.ldif";
+ private static final String CORE_SCHEMA_ELEMENTS_FILE = "00-core.ldif";
@@ -4325,11 +4326,13 @@
{
String schemaFile = removeType.getSchemaFile();
if ((schemaFile != null) &&
- (schemaFile.equals(CONFIG_SCHEMA_ELEMENTS_FILE)))
+ ((schemaFile.equals(CONFIG_SCHEMA_ELEMENTS_FILE)) ||
+ (schemaFile.equals(CORE_SCHEMA_ELEMENTS_FILE))) )
{
- // Don't import the file containing the definitiong of the
+ // Don't import the file containing the definitions of the
// Schema elements used for configuration because these
// definitions may vary between versions of OpenDS.
+ // Also never delete anything from the core schema file.
continue;
}
if (!oidList.contains(removeType.getOID()))
@@ -4447,7 +4450,7 @@
if ((schemaFile != null) &&
(schemaFile.equals(CONFIG_SCHEMA_ELEMENTS_FILE)))
{
- // Don't import the file containing the definitiong of the
+ // Don't import the file containing the definition of the
// Schema elements used for configuration because these
// definitions may vary between versions of OpenDS.
continue;
--
Gitblit v1.10.0