From 7adb93986ace907531875e25be1f94d735fbb068 Mon Sep 17 00:00:00 2001
From: gbellato <gbellato@localhost>
Date: Mon, 08 Dec 2008 08:03:33 +0000
Subject: [PATCH] Merge the replication-service branch with the OpenDS trunk
---
opendj-sdk/opends/src/server/org/opends/server/replication/server/ServerReader.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/server/ServerReader.java b/opendj-sdk/opends/src/server/org/opends/server/replication/server/ServerReader.java
index 78c70fa..bea8995 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/server/ServerReader.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/server/ServerReader.java
@@ -141,7 +141,7 @@
{
AckMsg ack = (AckMsg) msg;
handler.checkWindow();
- replicationServerDomain.ack(ack, serverId);
+ replicationServerDomain.processAck(ack, handler);
} else if (msg instanceof UpdateMsg)
{
boolean filtered = false;
@@ -171,7 +171,7 @@
logError(ERR_IGNORING_UPDATE_FROM_DS_BADGENID.get(
Short.toString(replicationServerDomain.
getReplicationServer().getServerId()),
- replicationServerDomain.getBaseDn().toNormalizedString(),
+ replicationServerDomain.getBaseDn(),
((UpdateMsg) msg).getChangeNumber().toString(),
Short.toString(handler.getServerId()),
Long.toString(referenceGenerationId),
@@ -180,7 +180,7 @@
logError(ERR_IGNORING_UPDATE_FROM_DS_FULLUP.get(
Short.toString(replicationServerDomain.
getReplicationServer().getServerId()),
- replicationServerDomain.getBaseDn().toNormalizedString(),
+ replicationServerDomain.getBaseDn(),
((UpdateMsg) msg).getChangeNumber().toString(),
Short.toString(handler.getServerId())));
filtered = true;
@@ -199,7 +199,7 @@
logError(ERR_IGNORING_UPDATE_FROM_RS.get(
Short.toString(replicationServerDomain.getReplicationServer().
getServerId()),
- replicationServerDomain.getBaseDn().toNormalizedString(),
+ replicationServerDomain.getBaseDn(),
((UpdateMsg) msg).getChangeNumber().toString(),
Short.toString(handler.getServerId()),
Long.toString(referenceGenerationId),
--
Gitblit v1.10.0