From d04fb0f282e0fd9a4bc80d3f9d5ee15506a3b83b Mon Sep 17 00:00:00 2001
From: gbellato <gbellato@localhost>
Date: Mon, 08 Dec 2008 08:03:33 +0000
Subject: [PATCH] Merge the replication-service branch with the OpenDS trunk
---
opends/src/server/org/opends/server/replication/plugin/PendingChange.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/plugin/PendingChange.java b/opends/src/server/org/opends/server/replication/plugin/PendingChange.java
index 2ff4904..0bc994e 100644
--- a/opends/src/server/org/opends/server/replication/plugin/PendingChange.java
+++ b/opends/src/server/org/opends/server/replication/plugin/PendingChange.java
@@ -28,7 +28,7 @@
import org.opends.server.replication.common.ChangeNumber;
import org.opends.server.replication.common.ServerState;
-import org.opends.server.replication.protocol.UpdateMsg;
+import org.opends.server.replication.protocol.LDAPUpdateMsg;
import org.opends.server.types.DN;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.operation.PluginOperation;
@@ -41,7 +41,7 @@
{
private ChangeNumber changeNumber;
private boolean committed;
- private UpdateMsg msg;
+ private LDAPUpdateMsg msg;
private PluginOperation op;
private ServerState dependencyState = null;
private DN targetDN = null;
@@ -54,7 +54,7 @@
*/
public PendingChange(ChangeNumber changeNumber,
PluginOperation op,
- UpdateMsg msg)
+ LDAPUpdateMsg msg)
{
this.changeNumber = changeNumber;
this.committed = false;
@@ -94,7 +94,7 @@
* @return the message if operation was a replication operation
* null if the operation was a local operation
*/
- public UpdateMsg getMsg()
+ public LDAPUpdateMsg getMsg()
{
return msg;
}
@@ -103,7 +103,7 @@
* Set the message associated to the PendingChange.
* @param msg the message
*/
- public void setMsg(UpdateMsg msg)
+ public void setMsg(LDAPUpdateMsg msg)
{
this.msg = msg;
}
--
Gitblit v1.10.0