From 15d7493b9a9c92cee95d284a687b92df546a2153 Mon Sep 17 00:00:00 2001
From: Ludovic Poitou <ludovic.poitou@forgerock.com>
Date: Wed, 28 Mar 2012 15:16:02 +0000
Subject: [PATCH] Minor change in ModDN operation. Replication resolution needs more context about the new entry.
---
opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendModifyDNOperation.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendModifyDNOperation.java b/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendModifyDNOperation.java
index 0b13532..eb93e30 100644
--- a/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendModifyDNOperation.java
+++ b/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendModifyDNOperation.java
@@ -23,7 +23,7 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions Copyright 2011 ForgeRock AS
+ * Portions Copyright 2011-2012 ForgeRock AS
*/
package org.opends.server.workflowelement.localbackend;
@@ -397,10 +397,6 @@
break modifyDNProcessing;
}
- if(!handleConflictResolution()) {
- break modifyDNProcessing;
- }
-
// Check to see if there are any controls in the request. If so, then
// see if there is any special processing required.
@@ -457,6 +453,9 @@
addModification(null);
List<Modification> modifications = this.getModifications();
+ if(!handleConflictResolution()) {
+ break modifyDNProcessing;
+ }
// If the operation is not a synchronization operation,
// - Apply the RDN changes.
@@ -670,6 +669,7 @@
registerPostResponseCallback(new Runnable()
{
+ @Override
public void run()
{
// Notify persistent searches.
--
Gitblit v1.10.0