From 98fa32c5631887c8e8cdc87dfc564dc0af2d0990 Mon Sep 17 00:00:00 2001
From: fdorson <fdorson@localhost>
Date: Thu, 03 Jul 2008 16:11:05 +0000
Subject: [PATCH] Roll Back changes related to issue #3314 because it seems to make the InitOnlineTest fail
---
opendj-sdk/opends/src/server/org/opends/server/replication/plugin/ReplicationDomain.java | 12 ++----------
1 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/ReplicationDomain.java b/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/ReplicationDomain.java
index 91d3227b..5c11a47 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/ReplicationDomain.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/ReplicationDomain.java
@@ -2248,14 +2248,12 @@
disabled = true;
// Stop the listener thread
- if (listenerThread != null)
- listenerThread.shutdown();
+ listenerThread.shutdown();
broker.stop(); // This will cut the session and wake up the listener
// Wait for the listener thread to stop
- if (listenerThread != null)
- listenerThread.waitForShutdown();
+ listenerThread.waitForShutdown();
}
/**
@@ -3467,12 +3465,6 @@
maxSendQueue, maxSendDelay, window, heartbeatInterval);
isolationpolicy = configuration.getIsolationPolicy();
- // To be able to stop and restart the broker properly just
- // disable and enable the domain. That way a new session
- // with the new configuration is available.
- this.disable();
- this.enable();
-
return new ConfigChangeResult(ResultCode.SUCCESS, false);
}
--
Gitblit v1.10.0