From e07cdcbd253fd366c5002f7368470e0158bfcc2c Mon Sep 17 00:00:00 2001
From: gbellato <gbellato@localhost>
Date: Mon, 13 Nov 2006 08:31:12 +0000
Subject: [PATCH] Fix for 982 : reorganize synchronization code :
---
opends/src/server/org/opends/server/synchronization/plugin/MultimasterSynchronization.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/opends/src/server/org/opends/server/synchronization/MultimasterSynchronization.java b/opends/src/server/org/opends/server/synchronization/plugin/MultimasterSynchronization.java
similarity index 96%
rename from opends/src/server/org/opends/server/synchronization/MultimasterSynchronization.java
rename to opends/src/server/org/opends/server/synchronization/plugin/MultimasterSynchronization.java
index 7369a49..0143f89 100644
--- a/opends/src/server/org/opends/server/synchronization/MultimasterSynchronization.java
+++ b/opends/src/server/org/opends/server/synchronization/plugin/MultimasterSynchronization.java
@@ -24,7 +24,7 @@
*
* Portions Copyright 2006 Sun Microsystems, Inc.
*/
-package org.opends.server.synchronization;
+package org.opends.server.synchronization.plugin;
import java.util.HashMap;
import java.util.Map;
@@ -33,10 +33,12 @@
import org.opends.server.api.ConfigChangeListener;
import org.opends.server.api.ConfigDeleteListener;
import org.opends.server.api.SynchronizationProvider;
-import org.opends.server.changelog.Changelog;
import org.opends.server.config.ConfigEntry;
import org.opends.server.config.ConfigException;
import org.opends.server.core.AddOperation;
+import org.opends.server.synchronization.changelog.Changelog;
+import org.opends.server.synchronization.common.LogMessages;
+import org.opends.server.synchronization.common.ServerState;
import org.opends.server.types.DN;
import org.opends.server.core.DeleteOperation;
import org.opends.server.types.DirectoryException;
@@ -49,7 +51,7 @@
import org.opends.server.types.ResultCode;
import org.opends.server.types.SynchronizationProviderResult;
-import static org.opends.server.synchronization.SynchMessages.*;
+import static org.opends.server.synchronization.common.LogMessages.*;
/**
* This class is used to load the Synchronization code inside the JVM
@@ -93,7 +95,7 @@
public void initializeSynchronizationProvider(ConfigEntry configEntry)
throws ConfigException
{
- SynchMessages.registerMessages();
+ LogMessages.registerMessages();
configEntry.registerAddListener(this);
configEntry.registerDeleteListener(this);
@@ -469,6 +471,10 @@
}
} while (domain == null);
+ /*
+ * Don't apply synchronization to the special entry where the ServerState
+ * is stored.
+ */
if ((domain!= null) && (domain.getServerStateDN().equals(dn)))
return null;
--
Gitblit v1.10.0