From 20396bec93ad0de9b6cefee7c7b1ad628d6ea1ae Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 18 Sep 2013 15:17:14 +0000
Subject: [PATCH] OPENDJ-1116 Introduce abstraction for the changelog DB
---
opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationBackend.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationBackend.java b/opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationBackend.java
index a6bec09..ff8c99f 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationBackend.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationBackend.java
@@ -537,7 +537,7 @@
}
else
{
- DN baseDN = DN.decode(rsd.getBaseDn() + "," + BASE_DN);
+ DN baseDN = DN.decode(rsd.getBaseDN() + "," + BASE_DN);
for (DN includeBranch : includeBranches)
{
if (includeBranch.isDescendantOf(baseDN)
@@ -591,14 +591,14 @@
TRACER.debugInfo("State=" + serverState);
Attribute stateAttr = Attributes.create("state", serverState.toString());
Attribute genidAttr = Attributes.create("generation-id",
- exportContainer.getGenerationId() + exportContainer.getBaseDn());
+ "" + exportContainer.getGenerationId() + exportContainer.getBaseDN());
attrs.clear();
attrs.put(ocType, singletonList(ocAttr));
attrs.put(stateAttr.getAttributeType(), singletonList(stateAttr));
attrs.put(genidAttr.getAttributeType(), singletonList(genidAttr));
- final String dnString = exportContainer.getBaseDn() + "," + BASE_DN;
+ final String dnString = exportContainer.getBaseDN() + "," + BASE_DN;
try
{
DN dn = DN.decode(dnString);
@@ -651,7 +651,7 @@
}
lookthroughCount++;
writeChange(cursor.getChange(), ldifWriter, searchOperation,
- rsd.getBaseDn(), exportConfig != null);
+ rsd.getBaseDN(), exportConfig != null);
cursor.next();
}
}
@@ -758,7 +758,7 @@
* Exports one change.
*/
private void writeChange(UpdateMsg updateMsg, LDIFWriter ldifWriter,
- SearchOperation searchOperation, String baseDN, boolean isExport)
+ SearchOperation searchOperation, DN baseDN, boolean isExport)
{
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
@@ -862,7 +862,8 @@
addAttribute(entry.getUserAttributes(), CHANGE_NUMBER,
msg.getCSN().toString());
- addAttribute(entry.getUserAttributes(), "replicationDomain", baseDN);
+ addAttribute(entry.getUserAttributes(), "replicationDomain",
+ baseDN.toNormalizedString());
// Get the base DN, scope, and filter for the search.
DN searchBaseDN = searchOperation.getBaseDN();
@@ -1222,7 +1223,7 @@
ReplicationServerDomain rsd = iter.next();
// Skip containers that are not covered by the include branches.
- DN baseDN = DN.decode(rsd.getBaseDn() + "," + BASE_DN);
+ DN baseDN = DN.decode(rsd.getBaseDN() + "," + BASE_DN);
if (searchBaseDN.isDescendantOf(baseDN)
|| searchBaseDN.isAncestorOf(baseDN))
{
--
Gitblit v1.10.0