Resolve an issue where some changes might appear to be missing after restor...

ludovicp

31.06.2010 3108952a616e5a7548f646555c716bdc52db91ea

 opends/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java

@@ -2257,15 +2257,6 @@
        numResolvedModifyConflicts.incrementAndGet();
      }

      if (modifyOperation.getModifications().isEmpty())
      {
        /*
         * This operation becomes a no-op due to conflict resolution
         * stop the processing and send an OK result
         */
        return new SynchronizationProviderResult.StopProcessing(
            ResultCode.SUCCESS, null);
      }
    }
    return new SynchronizationProviderResult.ContinueProcessing();
  }
@@ -3160,11 +3151,6 @@
    // Find an rename child entries.
    InternalClientConnection conn =
      InternalClientConnection.getRootConnection();
    DeleteContext ctx =
      (DeleteContext) conflictOp.getAttachment(SYNCHROCONTEXT);
    ChangeNumber cn = null;
    if (ctx != null)
      cn = ctx.getChangeNumber();

    try
    {