From 64a414d1e8790f167e26819dc5d5322face58182 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Mon, 07 Oct 2013 08:32:39 +0000
Subject: [PATCH] OPENDJ-1116 Introduce abstraction for the changelog DB
---
opends/src/server/org/opends/server/replication/server/ReplicationServerDomain.java | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/server/ReplicationServerDomain.java b/opends/src/server/org/opends/server/replication/server/ReplicationServerDomain.java
index 8ac9d55..4f3be6f 100644
--- a/opends/src/server/org/opends/server/replication/server/ReplicationServerDomain.java
+++ b/opends/src/server/org/opends/server/replication/server/ReplicationServerDomain.java
@@ -205,9 +205,6 @@
public void put(UpdateMsg update, ServerHandler sourceHandler)
throws IOException
{
- CSN csn = update.getCSN();
- int serverId = csn.getServerId();
-
sourceHandler.updateServerState(update);
sourceHandler.incrementInCount();
setGenerationIdIfUnset(sourceHandler.getGenerationId());
@@ -264,7 +261,7 @@
}
}
- if (!publishUpdateMsg(update, serverId))
+ if (!publishUpdateMsg(update))
{
return;
}
@@ -284,6 +281,7 @@
// The following timer will time out and send an timeout ack to the
// requester if the acks are not received in time. The timer will also
// remove the object from this map.
+ CSN csn = update.getCSN();
waitingAcks.put(csn, preparedAssuredInfo.expectedAcksInfo);
// Arm timer for this assured update message (wait for acks until it
@@ -402,11 +400,11 @@
}
}
- private boolean publishUpdateMsg(UpdateMsg updateMsg, int serverId)
+ private boolean publishUpdateMsg(UpdateMsg updateMsg)
{
try
{
- if (this.domainDB.publishUpdateMsg(baseDN, serverId, updateMsg))
+ if (this.domainDB.publishUpdateMsg(baseDN, updateMsg))
{
/*
* JNR: Matt and I had a hard time figuring out where to put this
--
Gitblit v1.10.0