From 7adb93986ace907531875e25be1f94d735fbb068 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
---
opendj-sdk/opends/src/server/org/opends/server/replication/protocol/ReplServerStartMsg.java | 20 +++++---------------
1 files changed, 5 insertions(+), 15 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/ReplServerStartMsg.java b/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/ReplServerStartMsg.java
index 5bed97d..f1bdb60 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/ReplServerStartMsg.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/ReplServerStartMsg.java
@@ -30,8 +30,6 @@
import java.util.zip.DataFormatException;
import org.opends.server.replication.common.ServerState;
-import org.opends.server.types.DirectoryException;
-import org.opends.server.types.DN;
/**
* Message sent by a replication server to another replication server
@@ -73,7 +71,7 @@
* @param groupId The group id of the RS
* @param degradedStatusThreshold The degraded status threshold
*/
- public ReplServerStartMsg(short serverId, String serverURL, DN baseDn,
+ public ReplServerStartMsg(short serverId, String serverURL, String baseDn,
int windowSize,
ServerState serverState,
short protocolVersion,
@@ -86,7 +84,7 @@
this.serverId = serverId;
this.serverURL = serverURL;
if (baseDn != null)
- this.baseDn = baseDn.toNormalizedString();
+ this.baseDn = baseDn;
else
this.baseDn = null;
this.windowSize = windowSize;
@@ -202,17 +200,9 @@
*
* @return the base DN from this ReplServerStartMsg.
*/
- public DN getBaseDn()
+ public String getBaseDn()
{
- if (baseDn == null)
- return null;
- try
- {
- return DN.decode(baseDn);
- } catch (DirectoryException e)
- {
- return null;
- }
+ return baseDn;
}
/**
@@ -333,8 +323,8 @@
return "ReplServerStartMsg content: " +
"\nprotocolVersion: " + protocolVersion +
"\ngenerationId: " + generationId +
+ "\nbaseDn: " + baseDn +
"\ngroupId: " + groupId +
- "\nbaseDn: " + baseDn.toString() +
"\nserverId: " + serverId +
"\nserverState: " + serverState +
"\nserverURL: " + serverURL +
--
Gitblit v1.10.0