Forward port fix OPENDJ-1190: Under rare circumstances the DS replication r...

Chris Ridd

19.32.2014 becb4e248a76ade66e1c410bc53dc800430552b0

 opendj3-server-dev/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java

@@ -4235,13 +4235,25 @@

      if (lastRetrievedChange != null)
      {
        if (logger.isInfoEnabled())
          logger.info(LocalizableMessage.raw("publish loop"
                  + " >=" + currentStartCSN + " <=" + endCSN
                  + " nentries=" + op.getEntriesSent()
                  + " result=" + op.getResultCode()
                  + " lastRetrievedChange=" + lastRetrievedChange));
        currentStartCSN = lastRetrievedChange;
      }
      else
      {
        if (logger.isInfoEnabled())
          logger.info(LocalizableMessage.raw("publish loop"
                  + " >=" + currentStartCSN + " <=" + endCSN
                  + " nentries=" + op.getEntriesSent()
                  + " result=" + op.getResultCode()
                  + " no changes"));
        currentStartCSN = endCSN;
      }
    } while (pendingChanges.recoveryUntil(lastRetrievedChange)
    } while (pendingChanges.recoveryUntil(currentStartCSN)
          && op.getResultCode().equals(ResultCode.SUCCESS));

    return op.getResultCode().equals(ResultCode.SUCCESS);