From 7bb5b9a55a8d68f9622ca3ae6bb22b889b0a6a3f Mon Sep 17 00:00:00 2001
From: gbellato <gbellato@localhost>
Date: Mon, 16 Mar 2009 08:06:01 +0000
Subject: [PATCH] Fix for issue 3402 : Replication conflict: fail to resolve double mod_rdn of same entry
---
opends/src/server/org/opends/server/replication/plugin/MultimasterReplication.java | 27 ++++++++++++++++++++++++++-
1 files changed, 26 insertions(+), 1 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 bbc0a82..2afd51d 100644
--- a/opends/src/server/org/opends/server/replication/plugin/MultimasterReplication.java
+++ b/opends/src/server/org/opends/server/replication/plugin/MultimasterReplication.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2006-2008 Sun Microsystems, Inc.
+ * Copyright 2006-2009 Sun Microsystems, Inc.
*/
package org.opends.server.replication.plugin;
@@ -33,6 +33,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.concurrent.BlockingQueue;
import java.util.concurrent.LinkedBlockingQueue;
import org.opends.messages.Message;
@@ -207,6 +208,30 @@
}
/**
+ * Creates a new domain from its configEntry, do the
+ * necessary initialization and starts it so that it is
+ * fully operational when this method returns.
+ *
+ * @param configuration The entry with the configuration of this domain.
+ * @param queue The BlockingQueue that this domain will use.
+ *
+ * @return The domain created.
+ *
+ * @throws ConfigException When the configuration is not valid.
+ */
+ public static LDAPReplicationDomain createNewDomain(
+ ReplicationDomainCfg configuration,
+ BlockingQueue<UpdateToReplay> queue)
+ throws ConfigException
+ {
+ LDAPReplicationDomain domain;
+ domain = new LDAPReplicationDomain(configuration, queue);
+
+ domains.put(domain.getBaseDN(), domain);
+ return domain;
+ }
+
+ /**
* Deletes a domain.
* @param dn : the base DN of the domain to delete.
*/
--
Gitblit v1.10.0