From 27860483705d562fd31efa3348c54923123ccc10 Mon Sep 17 00:00:00 2001
From: jarnou <jarnou@localhost>
Date: Tue, 17 Jul 2007 08:14:43 +0000
Subject: [PATCH] This fix is the refactoring of the modrdn operation [issue 1180]
---
opendj-sdk/opends/src/server/org/opends/server/replication/plugin/ReplicationDomain.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/ReplicationDomain.java b/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/ReplicationDomain.java
index 09ae24f..66d9e56 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/ReplicationDomain.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/ReplicationDomain.java
@@ -66,7 +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;
import org.opends.server.protocols.asn1.ASN1Exception;
@@ -1243,13 +1243,13 @@
done = solveNamingConflict(newOp, addMsg);
}
}
- else if (op instanceof ModifyDNOperation)
+ else if (op instanceof ModifyDNOperationBasis)
{
ModifyDNMsg newMsg = (ModifyDNMsg) msg;
dependency = remotePendingChanges.checkDependencies(newMsg);
if (!dependency)
{
- ModifyDNOperation newOp = (ModifyDNOperation) op;
+ ModifyDNOperationBasis newOp = (ModifyDNOperationBasis) op;
done = solveNamingConflict(newOp, msg);
}
}
@@ -1570,7 +1570,7 @@
* @return true if the process is completed, false if it must continue.
* @throws Exception When the operation is not valid.
*/
-private boolean solveNamingConflict(ModifyDNOperation op,
+private boolean solveNamingConflict(ModifyDNOperationBasis op,
UpdateMessage msg) throws Exception
{
ResultCode result = op.getResultCode();
@@ -1843,7 +1843,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
- ModifyDNOperation newOp = conn.processModifyDN(
+ ModifyDNOperationBasis newOp = conn.processModifyDN(
dn, generateDeleteConflictDn(uid, dn),false, baseDN);
if (newOp.getResultCode() != ResultCode.SUCCESS)
--
Gitblit v1.10.0