From 60eebeca51e75c9d3fdb0a82f0a5b5be6f64dd17 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Mon, 23 Jan 2012 14:51:36 +0000
Subject: [PATCH] Fix OPENDJ-410: Frequent corruption in ds-sync-hist ordering index

---
 opends/src/server/org/opends/server/replication/plugin/MultimasterReplication.java |   26 +-------------------------
 1 files changed, 1 insertions(+), 25 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 80acfb0..304a757 100644
--- a/opends/src/server/org/opends/server/replication/plugin/MultimasterReplication.java
+++ b/opends/src/server/org/opends/server/replication/plugin/MultimasterReplication.java
@@ -23,7 +23,7 @@
  *
  *
  *      Copyright 2006-2010 Sun Microsystems, Inc.
- *      Portions Copyright 2011 ForgeRock AS
+ *      Portions Copyright 2011-2012 ForgeRock AS
  */
 package org.opends.server.replication.plugin;
 
@@ -120,8 +120,6 @@
 
   private boolean isRegistered = false;
 
-  private static boolean initializationCompleted = true;
-
   /**
    * The configurable connection/handshake timeout.
    */
@@ -276,7 +274,6 @@
       ReplicationSynchronizationProviderCfg configuration)
   throws ConfigException
   {
-    initializationCompleted = false;
     domains.clear();
     replicationServerListener = new ReplicationServerListener(configuration);
 
@@ -318,8 +315,6 @@
 
     DirectoryServer.registerSupportedControl(
         ReplicationRepairRequestControl.OID_REPLICATION_REPAIR_CONTROL);
-
-    initializationCompleted = true;
   }
 
   /**
@@ -874,25 +869,6 @@
   }
 
   /**
-   * Checks if a given serverID is used by a local Replication Domain.
-   *
-   * @param serverId   The serverID that should be checked.
-   * @return           true if the serverID is local, false otherwise.
-   */
-  public static boolean isLocalServerId(Integer serverId)
-  {
-    if (!initializationCompleted)
-      return true;
-
-    for (LDAPReplicationDomain domain : domains.values())
-    {
-      if (domain.getServerId() == serverId)
-        return true;
-    }
-    return false;
-  }
-
-  /**
    * Returns the connection timeout in milli-seconds.
    *
    * @return The connection timeout in milli-seconds.

--
Gitblit v1.10.0