From 0bee1ee3a776af367c685d042155cd43ae71deab 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 :
---
opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/SynchronizationDomain.java | 35 ++++++++++++++++++++++++++++-------
1 files changed, 28 insertions(+), 7 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/synchronization/SynchronizationDomain.java b/opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/SynchronizationDomain.java
similarity index 97%
rename from opendj-sdk/opends/src/server/org/opends/server/synchronization/SynchronizationDomain.java
rename to opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/SynchronizationDomain.java
index 766359b..a11c2bd 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/synchronization/SynchronizationDomain.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/SynchronizationDomain.java
@@ -24,15 +24,15 @@
*
* Portions Copyright 2006 Sun Microsystems, Inc.
*/
-package org.opends.server.synchronization;
+package org.opends.server.synchronization.plugin;
import static org.opends.server.util.StaticUtils.stackTraceToSingleLineString;
import static org.opends.server.util.TimeThread.getTime;
-import static org.opends.server.synchronization.SynchMessages.*;
+import static org.opends.server.synchronization.common.LogMessages.*;
+import static org.opends.server.synchronization.plugin.Historical.*;
+import static org.opends.server.synchronization.protocol.OperationContext.*;
import static org.opends.server.loggers.Error.*;
import static org.opends.server.messages.MessageHandler.*;
-import static org.opends.server.synchronization.OperationContext.SYNCHROCONTEXT;
-import static org.opends.server.synchronization.Historical.*;
import java.net.SocketTimeoutException;
import java.util.ArrayList;
@@ -63,6 +63,18 @@
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.protocols.internal.InternalSearchOperation;
import org.opends.server.protocols.ldap.LDAPException;
+import org.opends.server.synchronization.common.ChangeNumber;
+import org.opends.server.synchronization.common.ChangeNumberGenerator;
+import org.opends.server.synchronization.common.ServerState;
+import org.opends.server.synchronization.protocol.AckMessage;
+import org.opends.server.synchronization.protocol.AddContext;
+import org.opends.server.synchronization.protocol.DeleteContext;
+import org.opends.server.synchronization.protocol.ModifyContext;
+import org.opends.server.synchronization.protocol.ModifyDNMsg;
+import org.opends.server.synchronization.protocol.ModifyDnContext;
+import org.opends.server.synchronization.protocol.OperationContext;
+import org.opends.server.synchronization.protocol.SynchronizationMessage;
+import org.opends.server.synchronization.protocol.UpdateMessage;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.DN;
@@ -103,7 +115,7 @@
private int numSentUpdates = 0;
private int numProcessedUpdates = 0;
private int debugCount = 0;
- private ServerState state;
+ private PersistentServerState state;
private int numReplayedPostOpCalled = 0;
private int maxReceiveQueue = 0;
@@ -204,7 +216,7 @@
baseDN = baseDn.activeValue();
configAttributes.add(baseDn);
- state = new ServerState(baseDN);
+ state = new PersistentServerState(baseDN);
state.loadState();
/*
@@ -704,7 +716,16 @@
return null;
}
- update = msg.processReceive(this);
+ if (msg instanceof AckMessage)
+ {
+ AckMessage ack = (AckMessage) msg;
+ receiveAck(ack);
+ }
+ else if (msg instanceof UpdateMessage)
+ {
+ update = (UpdateMessage) msg;
+ receiveUpdate(update);
+ }
} catch (SocketTimeoutException e)
{
// just retry
--
Gitblit v1.10.0