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/server/ReplicationDB.java | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationDB.java b/opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationDB.java
index 8a69489..f83631a 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationDB.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationDB.java
@@ -34,7 +34,6 @@
import java.util.List;
import java.io.UnsupportedEncodingException;
-import org.opends.server.types.DN;
import org.opends.server.replication.common.ChangeNumber;
import org.opends.server.replication.protocol.UpdateMsg;
import java.util.concurrent.locks.ReentrantReadWriteLock;
@@ -59,7 +58,7 @@
private ReplicationDbEnv dbenv = null;
private ReplicationServer replicationServer;
private Short serverId;
- private DN baseDn;
+ private String baseDn;
// The maximum number of retries in case of DatabaseDeadlock Exception.
private static final int DEADLOCK_RETRIES = 10;
@@ -77,7 +76,7 @@
* @param dbenv The Db environment to use to create the db.
* @throws DatabaseException If a database problem happened.
*/
- public ReplicationDB(Short serverId, DN baseDn,
+ public ReplicationDB(Short serverId, String baseDn,
ReplicationServer replicationServer,
ReplicationDbEnv dbenv)
throws DatabaseException
--
Gitblit v1.10.0