opends/src/server/org/opends/server/replication/plugin/EntryHistorical.java
@@ -23,6 +23,7 @@ * * * Copyright 2006-2010 Sun Microsystems, Inc. * Portions Copyright 2011 ForgeRock AS */ package org.opends.server.replication.plugin; @@ -621,7 +622,7 @@ * @return A boolean indicating if the Entry was renamed or added after * the ChangeNumber that is given as a parameter. */ public boolean AddedOrRenamedAfter(ChangeNumber cn) public boolean addedOrRenamedAfter(ChangeNumber cn) { if (cn.older(entryADDDate) || cn.older(entryMODDNDate)) { opends/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java
@@ -2106,7 +2106,7 @@ */ EntryHistorical hist = EntryHistorical.newInstanceFromEntry( modifyDNOperation.getOriginalEntry()); if (hist.AddedOrRenamedAfter(ctx.getChangeNumber())) if (hist.addedOrRenamedAfter(ctx.getChangeNumber())) { return new SynchronizationProviderResult.StopProcessing( ResultCode.NO_OPERATION, null); @@ -2462,7 +2462,7 @@ entrytoRename = entry; entrytoRenameDate = history.getDNDate(); } else if (!history.AddedOrRenamedAfter(entrytoRenameDate)) else if (!history.addedOrRenamedAfter(entrytoRenameDate)) { // this conflict is older than the previous, keep it. entrytoRename = entry; @@ -4830,7 +4830,7 @@ currentStartChangeNumber = endChangeNumber; } } while (pendingChanges.RecoveryUntil(lastRetrievedChange) && } while (pendingChanges.recoveryUntil(lastRetrievedChange) && (op.getResultCode().equals(ResultCode.SUCCESS))); return op.getResultCode().equals(ResultCode.SUCCESS); opends/src/server/org/opends/server/replication/plugin/PendingChanges.java
@@ -23,6 +23,7 @@ * * * Copyright 2009 Sun Microsystems, Inc. * Portions Copyright 2011 ForgeRock AS */ package org.opends.server.replication.plugin; @@ -288,7 +289,7 @@ * or must continue (true). */ public synchronized boolean RecoveryUntil(ChangeNumber recovered) public synchronized boolean recoveryUntil(ChangeNumber recovered) { ChangeNumber lastLocalChange = domain.getLastLocalChange();