From 306cc46a572107f624d8a90e9b94c06cbef6de39 Mon Sep 17 00:00:00 2001
From: pgamba <pgamba@localhost>
Date: Wed, 26 Aug 2009 13:01:52 +0000
Subject: [PATCH] Fix for 4192 Trailing replicated server process after stop - db must be shutdowned before env
---
opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationServer.java | 3 ++-
opendj-sdk/opends/src/server/org/opends/server/replication/server/DraftCNDB.java | 8 +++-----
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/server/DraftCNDB.java b/opendj-sdk/opends/src/server/org/opends/server/replication/server/DraftCNDB.java
index 15026ef..7312c5e 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/server/DraftCNDB.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/server/DraftCNDB.java
@@ -36,7 +36,6 @@
import org.opends.messages.MessageBuilder;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.replication.common.ChangeNumber;
-import org.opends.server.types.DN;
import org.opends.server.types.DebugLogLevel;
import com.sleepycat.je.Cursor;
@@ -59,7 +58,6 @@
private Database db = null;
private ReplicationDbEnv dbenv = null;
private ReplicationServer replicationServer;
- private DN baseDn;
// The maximum number of retries in case of DatabaseDeadlock Exception.
private static final int DEADLOCK_RETRIES = 10;
@@ -407,7 +405,7 @@
@Override
public String toString()
{
- return "DraftCNDB:" + baseDn.toString();
+ return "DraftCNDB";
}
/**
@@ -677,8 +675,8 @@
}
/**
- * a.
- * @return a.
+ * Go to the next record on the cursor.
+ * @return the next record on this cursor.
* @throws DatabaseException a.
*/
public boolean next() throws DatabaseException
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationServer.java b/opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationServer.java
index 3b06977..132de94 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationServer.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationServer.java
@@ -737,12 +737,13 @@
replicationServerDomain.shutdown();
}
+ shutdownECL();
+
if (dbEnv != null)
{
dbEnv.shutdown();
}
- shutdownECL();
}
--
Gitblit v1.10.0