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/protocol/InitializeTargetMsg.java | 19 ++++---------------
1 files changed, 4 insertions(+), 15 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/protocol/InitializeTargetMsg.java b/opends/src/server/org/opends/server/replication/protocol/InitializeTargetMsg.java
index 70a80e2..194c4ea 100644
--- a/opends/src/server/org/opends/server/replication/protocol/InitializeTargetMsg.java
+++ b/opends/src/server/org/opends/server/replication/protocol/InitializeTargetMsg.java
@@ -29,9 +29,6 @@
import java.io.UnsupportedEncodingException;
import java.util.zip.DataFormatException;
-import org.opends.server.types.DN;
-import org.opends.server.types.DirectoryException;
-
/**
* This message is part of the replication protocol.
* This message is sent by a server to one or several servers as the
@@ -59,12 +56,12 @@
* @param requestorID The server that initiates this export.
* @param entryCount The count of entries that will be sent.
*/
- public InitializeTargetMsg(DN baseDN, short senderID,
+ public InitializeTargetMsg(String baseDN, short senderID,
short destination, short requestorID, long entryCount)
{
super(senderID, destination);
this.requestorID = requestorID;
- this.baseDN = baseDN.toNormalizedString();
+ this.baseDN = baseDN;
this.entryCount = entryCount;
}
@@ -144,17 +141,9 @@
*
* @return the base DN
*/
- public DN getBaseDN()
+ public String getBaseDN()
{
- if (baseDN == null)
- return null;
- try
- {
- return DN.decode(baseDN);
- } catch (DirectoryException e)
- {
- return null;
- }
+ return baseDN;
}
/**
--
Gitblit v1.10.0