From c739ae5e9f212fe6806d06b8bee5da0956991ce3 Mon Sep 17 00:00:00 2001
From: ludovicp <ludovicp@localhost>
Date: Mon, 07 Jun 2010 11:47:07 +0000
Subject: [PATCH] Fix a regression in NamingConflict test introduce by revision 6498
---
opends/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java | 4 ++++
1 files changed, 4 insertions(+), 0 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 3b45c55..513e014 100644
--- a/opends/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java
+++ b/opends/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java
@@ -3374,6 +3374,10 @@
*/
private void renameConflictEntry(Operation conflictOp, DN dn, String uid)
{
+ Message alertMessage = NOTE_UNRESOLVED_CONFLICT.get(dn.toString());
+ DirectoryServer.sendAlertNotification(this,
+ ALERT_TYPE_REPLICATION_UNRESOLVED_CONFLICT, alertMessage);
+
ModifyDNOperation newOp =
renameEntry(dn, generateDeleteConflictDn(uid, dn), baseDn, true);
--
Gitblit v1.10.0