From 6e14a8394d193af0fa32b83d3cc424787d41eadd Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 26 Jun 2014 13:19:57 +0000
Subject: [PATCH] OPENDJ-1453 (CR-3870) Replica offline messages should be synced with updates
---
opends/src/server/org/opends/server/replication/plugin/RemotePendingChanges.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/plugin/RemotePendingChanges.java b/opends/src/server/org/opends/server/replication/plugin/RemotePendingChanges.java
index 9d2b2d2..eb40c79 100644
--- a/opends/src/server/org/opends/server/replication/plugin/RemotePendingChanges.java
+++ b/opends/src/server/org/opends/server/replication/plugin/RemotePendingChanges.java
@@ -157,7 +157,7 @@
if (change.dependenciesIsCovered(state))
{
dependentChanges.remove(change);
- return change.getMsg();
+ return change.getLDAPUpdateMsg();
}
}
return null;
@@ -208,7 +208,7 @@
{
if (pendingChange.getCSN().isOlderThan(csn))
{
- final LDAPUpdateMsg pendingMsg = pendingChange.getMsg();
+ final LDAPUpdateMsg pendingMsg = pendingChange.getLDAPUpdateMsg();
if (pendingMsg != null)
{
if (pendingMsg instanceof DeleteMsg)
@@ -300,7 +300,7 @@
{
if (pendingChange.getCSN().isOlderThan(csn))
{
- final LDAPUpdateMsg pendingMsg = pendingChange.getMsg();
+ final LDAPUpdateMsg pendingMsg = pendingChange.getLDAPUpdateMsg();
if (pendingMsg instanceof AddMsg)
{
// Check if the operation to be run is an addOperation on a same DN.
@@ -350,13 +350,13 @@
return false;
}
- final DN targetDN = change.getMsg().getDN();
+ final DN targetDN = change.getLDAPUpdateMsg().getDN();
for (PendingChange pendingChange : pendingChanges.values())
{
if (pendingChange.getCSN().isOlderThan(csn))
{
- final LDAPUpdateMsg pendingMsg = pendingChange.getMsg();
+ final LDAPUpdateMsg pendingMsg = pendingChange.getLDAPUpdateMsg();
if (pendingMsg != null)
{
if (pendingMsg instanceof DeleteMsg)
@@ -442,7 +442,7 @@
{
if (pendingChange.getCSN().isOlderThan(csn))
{
- final LDAPUpdateMsg pendingMsg = pendingChange.getMsg();
+ final LDAPUpdateMsg pendingMsg = pendingChange.getLDAPUpdateMsg();
if (pendingMsg != null)
{
if (pendingMsg instanceof DeleteMsg)
--
Gitblit v1.10.0