From fc0a020218a55a4259d88d7c087fe022943c6bb4 Mon Sep 17 00:00:00 2001
From: Fabio Pistolesi <fabio.pistolesi@forgerock.com>
Date: Wed, 22 Jun 2016 10:22:02 +0000
Subject: [PATCH] OPENDJ-3066 LDAPReplicationDomain should track import and export of the domain via ReplicationDomain
---
opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/LDAPReplicationDomain.java | 9 +--------
1 files changed, 1 insertions(+), 8 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/LDAPReplicationDomain.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/LDAPReplicationDomain.java
index a5ba0c6..1fcd830 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/LDAPReplicationDomain.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/LDAPReplicationDomain.java
@@ -334,7 +334,6 @@
private final InternalClientConnection conn = getRootConnection();
private final AtomicBoolean shutdown = new AtomicBoolean();
private volatile boolean disabled;
- private volatile boolean stateSavingDisabled;
/**
* This list is used to temporary store operations that needs to be replayed
@@ -444,9 +443,8 @@
synchronized (this)
{
wait(1000);
- if (!disabled && !stateSavingDisabled)
+ if (!disabled && !ieRunning())
{
- // save the ServerState
state.save();
}
}
@@ -3513,9 +3511,6 @@
*/
private void preBackendImport(Backend<?> backend) throws DirectoryException
{
- // Stop saving state
- stateSavingDisabled = true;
-
// Prevent the processing of the backend finalisation event as the import will disable the attached backend
ignoreBackendInitializationEvent = true;
@@ -3574,8 +3569,6 @@
// Process import
preBackendImport(backend);
backend.importLDIF(importConfig, DirectoryServer.getInstance().getServerContext());
-
- stateSavingDisabled = false;
}
catch(Exception e)
{
--
Gitblit v1.10.0