From 2cf4412179a4ca8610d7fbb2108040377290bf82 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 06 Jun 2014 13:12:34 +0000
Subject: [PATCH] OPENDJ-1453 (CR-3697) Change time heart beat change numbers should be synced with updates
---
opends/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java | 7 ++++---
1 files changed, 4 insertions(+), 3 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 d3ec86d..e270ca0 100644
--- a/opends/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java
+++ b/opends/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java
@@ -97,6 +97,9 @@
* processing a change received from the replicationServer service,
* handle conflict resolution,
* handle protocol messages from the replicationServer.
+ * <p>
+ * FIXME Move this class to org.opends.server.replication.service
+ * or the equivalent package once this code is moved to a maven module.
*/
public final class LDAPReplicationDomain extends ReplicationDomain
implements ConfigurationChangeListener<ReplicationDomainCfg>,
@@ -4095,9 +4098,7 @@
// Now for bad data set status if needed
if (forceBadDataSet)
{
- // Go into bad data set status
- setNewStatus(StatusMachineEvent.TO_BAD_GEN_ID_STATUS_EVENT);
- broker.signalStatusChange(status);
+ signalNewStatus(StatusMachineEvent.TO_BAD_GEN_ID_STATUS_EVENT);
logError(NOTE_FRACTIONAL_BAD_DATA_SET_NEED_RESYNC.get(getBaseDNString()));
return; // Do not send changes to the replication server
}
--
Gitblit v1.10.0