From 2f0b5afe2ccd4ff47d74cdf54d6fe9f6ea0677e2 Mon Sep 17 00:00:00 2001
From: ludovicp <ludovicp@localhost>
Date: Mon, 31 May 2010 12:06:59 +0000
Subject: [PATCH] Resolve an issue where some changes might appear to be missing after restoring a backend. A replayed change that resolve in no change still must update the historical information.
---
opendj-sdk/opends/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java | 14 --------------
1 files changed, 0 insertions(+), 14 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java b/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java
index f887c0a..9af9669 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java
@@ -2257,15 +2257,6 @@
numResolvedModifyConflicts.incrementAndGet();
}
- if (modifyOperation.getModifications().isEmpty())
- {
- /*
- * This operation becomes a no-op due to conflict resolution
- * stop the processing and send an OK result
- */
- return new SynchronizationProviderResult.StopProcessing(
- ResultCode.SUCCESS, null);
- }
}
return new SynchronizationProviderResult.ContinueProcessing();
}
@@ -3160,11 +3151,6 @@
// Find an rename child entries.
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
- DeleteContext ctx =
- (DeleteContext) conflictOp.getAttachment(SYNCHROCONTEXT);
- ChangeNumber cn = null;
- if (ctx != null)
- cn = ctx.getChangeNumber();
try
{
--
Gitblit v1.10.0