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/ServerStartMsg.java | 16 ++++------------
1 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/protocol/ServerStartMsg.java b/opends/src/server/org/opends/server/replication/protocol/ServerStartMsg.java
index 8e8496b..f5679cc 100644
--- a/opends/src/server/org/opends/server/replication/protocol/ServerStartMsg.java
+++ b/opends/src/server/org/opends/server/replication/protocol/ServerStartMsg.java
@@ -32,8 +32,6 @@
import java.util.zip.DataFormatException;
import org.opends.server.replication.common.ServerState;
-import org.opends.server.types.DN;
-import org.opends.server.types.DirectoryException;
/**
* This message is used by LDAP server when they first connect.
@@ -85,7 +83,7 @@
* after the start messages have been exchanged.
* @param groupId The group id of the DS for this DN
*/
- public ServerStartMsg(short serverId, DN baseDn, int maxReceiveDelay,
+ public ServerStartMsg(short serverId, String baseDn, int maxReceiveDelay,
int maxReceiveQueue, int maxSendDelay,
int maxSendQueue, int windowSize,
long heartbeatInterval,
@@ -98,7 +96,7 @@
super(protocolVersion, generationId);
this.serverId = serverId;
- this.baseDn = baseDn.toString();
+ this.baseDn = baseDn;
this.maxReceiveDelay = maxReceiveDelay;
this.maxReceiveQueue = maxReceiveQueue;
this.maxSendDelay = maxSendDelay;
@@ -243,15 +241,9 @@
* Get the baseDn.
* @return Returns the baseDn.
*/
- public DN getBaseDn()
+ public String getBaseDn()
{
- try
- {
- return DN.decode(baseDn);
- } catch (DirectoryException e)
- {
- return null;
- }
+ return baseDn;
}
/**
--
Gitblit v1.10.0