From 6c09411df244a409bcd0a440a1e974ef91bd7035 Mon Sep 17 00:00:00 2001
From: pgamba <pgamba@localhost>
Date: Fri, 07 Sep 2007 08:57:27 +0000
Subject: [PATCH]
---
opends/src/server/org/opends/server/replication/plugin/MultimasterReplication.java | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/plugin/MultimasterReplication.java b/opends/src/server/org/opends/server/replication/plugin/MultimasterReplication.java
index 82b8b6f..f09fa82 100644
--- a/opends/src/server/org/opends/server/replication/plugin/MultimasterReplication.java
+++ b/opends/src/server/org/opends/server/replication/plugin/MultimasterReplication.java
@@ -26,10 +26,14 @@
*/
package org.opends.server.replication.plugin;
+import static org.opends.server.replication.plugin.
+ReplicationRepairRequestControl.*;
+
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import org.opends.messages.Message;
import org.opends.server.admin.server.ConfigurationAddListener;
import org.opends.server.admin.server.ConfigurationDeleteListener;
import org.opends.server.admin.std.server.MultimasterDomainCfg;
@@ -42,7 +46,6 @@
import org.opends.server.api.SynchronizationProvider;
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
-
import org.opends.server.types.BackupConfig;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.Control;
@@ -66,10 +69,6 @@
import org.opends.server.types.operation.PreOperationDeleteOperation;
import org.opends.server.types.operation.PreOperationModifyDNOperation;
import org.opends.server.types.operation.PreOperationModifyOperation;
-import org.opends.messages.Message;
-
-import static org.opends.server.replication.plugin.
- ReplicationRepairRequestControl.*;
/**
* This class is used to load the Replication code inside the JVM
@@ -86,7 +85,7 @@
BackupTaskListener, RestoreTaskListener, ImportTaskListener,
ExportTaskListener
{
- private ReplicationServerListener replicationServer = null;
+ private ReplicationServerListener replicationServerListener = null;
private static Map<DN, ReplicationDomain> domains =
new HashMap<DN, ReplicationDomain>() ;
@@ -193,7 +192,7 @@
MultimasterSynchronizationProviderCfg configuration)
throws ConfigException
{
- replicationServer = new ReplicationServerListener(configuration);
+ replicationServerListener = new ReplicationServerListener(configuration);
// Register as an add and delete listener with the root configuration so we
// can be notified if Multimaster domain entries are added or removed.
@@ -438,8 +437,8 @@
}
// shutdown the ReplicationServer Service if necessary
- if (replicationServer != null)
- replicationServer.shutdown();
+ if (replicationServerListener != null)
+ replicationServerListener.shutdown();
DirectoryServer.deregisterBackupTaskListener(this);
DirectoryServer.deregisterRestoreTaskListener(this);
--
Gitblit v1.10.0