From 4594bba26216d84018569a042f6517d966bf106f Mon Sep 17 00:00:00 2001
From: gbellato <gbellato@localhost>
Date: Mon, 10 Aug 2009 08:29:48 +0000
Subject: [PATCH] Fix for 4169 : Ability to disable generation of historical information and 4170 : Replication should not generate HistoricalCsnOrdering index for replayed operation
---
opends/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java b/opends/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java
index ae42a49..c598a8b 100644
--- a/opends/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java
+++ b/opends/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java
@@ -492,7 +492,7 @@
}
else
{
- solveConflictFlag = true;
+ solveConflictFlag = configuration.isSolveConflicts();
}
Backend backend = retrievesBackend(baseDn);
@@ -4369,6 +4369,22 @@
// Read fractional configuration and reconnect if needed
readFractionalConfig(configuration, true);
+ /*
+ * Modify conflicts are solved for all suffixes but the schema suffix
+ * because we don't want to store extra information in the schema
+ * ldif files.
+ * This has no negative impact because the changes on schema should
+ * not produce conflicts.
+ */
+ if (baseDn.compareTo(DirectoryServer.getSchemaDN()) == 0)
+ {
+ solveConflictFlag = false;
+ }
+ else
+ {
+ solveConflictFlag = configuration.isSolveConflicts();
+ }
+
return new ConfigChangeResult(ResultCode.SUCCESS, false);
}
--
Gitblit v1.10.0