From 35a408038c1de64a6f13f0e7b246a645e9945e3c Mon Sep 17 00:00:00 2001
From: boli <boli@localhost>
Date: Tue, 18 Mar 2008 22:44:58 +0000
Subject: [PATCH] With this refactoring:
---
opends/src/server/org/opends/server/replication/plugin/MultimasterReplication.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 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 81798bf..924be2b 100644
--- a/opends/src/server/org/opends/server/replication/plugin/MultimasterReplication.java
+++ b/opends/src/server/org/opends/server/replication/plugin/MultimasterReplication.java
@@ -387,7 +387,7 @@
ReplicationDomain domain =
findDomain(modifyOperation.getEntryDN(), modifyOperation);
if (domain == null)
- return new SynchronizationProviderResult(true);
+ return new SynchronizationProviderResult.ContinueProcessing();
return domain.handleConflictResolution(modifyOperation);
}
@@ -402,7 +402,7 @@
ReplicationDomain domain =
findDomain(addOperation.getEntryDN(), addOperation);
if (domain == null)
- return new SynchronizationProviderResult(true);
+ return new SynchronizationProviderResult.ContinueProcessing();
return domain.handleConflictResolution(addOperation);
}
@@ -417,7 +417,7 @@
ReplicationDomain domain =
findDomain(deleteOperation.getEntryDN(), deleteOperation);
if (domain == null)
- return new SynchronizationProviderResult(true);
+ return new SynchronizationProviderResult.ContinueProcessing();
return domain.handleConflictResolution(deleteOperation);
}
@@ -432,7 +432,7 @@
ReplicationDomain domain =
findDomain(modifyDNOperation.getEntryDN(), modifyDNOperation);
if (domain == null)
- return new SynchronizationProviderResult(true);
+ return new SynchronizationProviderResult.ContinueProcessing();
return domain.handleConflictResolution(modifyDNOperation);
}
@@ -448,7 +448,7 @@
ReplicationDomain domain = findDomain(operationDN, modifyOperation);
if ((domain == null) || (!domain.solveConflict()))
- return new SynchronizationProviderResult(true);
+ return new SynchronizationProviderResult.ContinueProcessing();
Historical historicalInformation = (Historical)
modifyOperation.getAttachment(
@@ -463,7 +463,7 @@
historicalInformation.generateState(modifyOperation);
- return new SynchronizationProviderResult(true);
+ return new SynchronizationProviderResult.ContinueProcessing();
}
/**
@@ -473,7 +473,7 @@
public SynchronizationProviderResult doPreOperation(
PreOperationDeleteOperation deleteOperation) throws DirectoryException
{
- return new SynchronizationProviderResult(true);
+ return new SynchronizationProviderResult.ContinueProcessing();
}
/**
@@ -484,7 +484,7 @@
PreOperationModifyDNOperation modifyDNOperation)
throws DirectoryException
{
- return new SynchronizationProviderResult(true);
+ return new SynchronizationProviderResult.ContinueProcessing();
}
/**
@@ -497,12 +497,12 @@
ReplicationDomain domain =
findDomain(addOperation.getEntryDN(), addOperation);
if (domain == null)
- return new SynchronizationProviderResult(true);
+ return new SynchronizationProviderResult.ContinueProcessing();
if (!addOperation.isSynchronizationOperation())
domain.doPreOperation(addOperation);
- return new SynchronizationProviderResult(true);
+ return new SynchronizationProviderResult.ContinueProcessing();
}
--
Gitblit v1.10.0