From 346fa902bcab5c5225e578fe32bb4442fd61afdb Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Thu, 29 Mar 2012 16:59:02 +0000
Subject: [PATCH] Fix OPENDJ-457: Sleeping replication threads prevent server from shutting down
---
opendj-sdk/opends/src/server/org/opends/server/replication/service/ReplicationDomain.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/service/ReplicationDomain.java b/opendj-sdk/opends/src/server/org/opends/server/replication/service/ReplicationDomain.java
index af277cc..f9ab3eb 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/service/ReplicationDomain.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/service/ReplicationDomain.java
@@ -3080,20 +3080,20 @@
{
synchronized (sessionLock)
{
- // Stop the listener thread
- if (listenerThread != null)
- {
- listenerThread.shutdown();
- }
-
+ // Stop the broker first in order to prevent the listener from
+ // reconnecting - see OPENDJ-457.
if (broker != null)
{
broker.stop();
}
- // Wait for the listener thread to stop
+ // Stop the listener thread
if (listenerThread != null)
+ {
+ listenerThread.shutdown();
listenerThread.waitForShutdown();
+ listenerThread = null;
+ }
}
}
--
Gitblit v1.10.0