mirror of https://github.com/OpenIdentityPlatform/OpenDJ.git

Ludovic Poitou
09.36.2011 2ef75b35230e435cbc7946d3c8efaddf3e57bb3d
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);