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/server/DbHandler.java | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/server/DbHandler.java b/opends/src/server/org/opends/server/replication/server/DbHandler.java
index b16aa28..097638d 100644
--- a/opends/src/server/org/opends/server/replication/server/DbHandler.java
+++ b/opends/src/server/org/opends/server/replication/server/DbHandler.java
@@ -43,7 +43,6 @@
import org.opends.server.config.ConfigException;
import org.opends.server.types.Attribute;
import org.opends.server.types.Attributes;
-import org.opends.server.types.DN;
import org.opends.server.types.InitializationException;
import org.opends.server.util.TimeThread;
import org.opends.server.core.DirectoryServer;
@@ -102,7 +101,7 @@
private ChangeNumber firstChange = null;
private ChangeNumber lastChange = null;
private short serverId;
- private DN baseDn;
+ private String baseDn;
private DbMonitorProvider dbMonitor = new DbMonitorProvider();
private boolean shutdown = false;
private boolean done = false;
@@ -133,7 +132,7 @@
* @throws DatabaseException If a database problem happened
*/
public DbHandler(
- short id, DN baseDn, ReplicationServer replicationServer,
+ short id, String baseDn, ReplicationServer replicationServer,
ReplicationDbEnv dbenv, int queueSize)
throws DatabaseException
{
--
Gitblit v1.10.0