From c429ea0c780d83a49531de1f7d42e9f802ce8fe8 Mon Sep 17 00:00:00 2001
From: jdemendi <jdemendi@localhost>
Date: Tue, 17 Jul 2007 15:21:52 +0000
Subject: [PATCH]
---
opends/src/server/org/opends/server/replication/plugin/ReplicationDomain.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/plugin/ReplicationDomain.java b/opends/src/server/org/opends/server/replication/plugin/ReplicationDomain.java
index 66d9e56..4b71da6 100644
--- a/opends/src/server/org/opends/server/replication/plugin/ReplicationDomain.java
+++ b/opends/src/server/org/opends/server/replication/plugin/ReplicationDomain.java
@@ -66,6 +66,7 @@
import org.opends.server.core.DeleteOperation;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.LockFileManager;
+import org.opends.server.core.ModifyDNOperation;
import org.opends.server.core.ModifyDNOperationBasis;
import org.opends.server.core.ModifyOperation;
import org.opends.server.core.ModifyOperationBasis;
@@ -1570,7 +1571,7 @@
* @return true if the process is completed, false if it must continue.
* @throws Exception When the operation is not valid.
*/
-private boolean solveNamingConflict(ModifyDNOperationBasis op,
+private boolean solveNamingConflict(ModifyDNOperation op,
UpdateMessage msg) throws Exception
{
ResultCode result = op.getResultCode();
@@ -1843,7 +1844,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
- ModifyDNOperationBasis newOp = conn.processModifyDN(
+ ModifyDNOperation newOp = conn.processModifyDN(
dn, generateDeleteConflictDn(uid, dn),false, baseDN);
if (newOp.getResultCode() != ResultCode.SUCCESS)
--
Gitblit v1.10.0