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

gbellato
01.40.2008 335a984ae6f4afac3d3d44195af75fe8d64ef760
opendj-sdk/opends/src/server/org/opends/server/replication/server/ServerHandler.java
@@ -857,16 +857,6 @@
    if (olderUpdateCN == null)
      return null;
    ReplicationIterator ri =
      replicationServerDomain.getChangelogIterator(serverId, olderUpdateCN);
    if (ri != null)
    {
      if (ri.next())
      {
        ChangeNumber firstMissingChange = ri.getChange().getChangeNumber();
        return firstMissingChange.getTime();
      }
    }
    return olderUpdateCN.getTime();
  }
@@ -1081,9 +1071,16 @@
            ChangeNumber lastCsn = serverState.getMaxChangeNumber(serverId);
            ReplicationIterator iterator =
              replicationServerDomain.getChangelogIterator(serverId, lastCsn);
            if ((iterator != null) && (iterator.getChange() != null))
            if (iterator != null)
            {
              iteratorSortedSet.add(iterator);
              if (iterator.getChange() != null)
              {
                iteratorSortedSet.add(iterator);
              }
              else
              {
                iterator.releaseCursor();
              }
            }
          }
          while (!iteratorSortedSet.isEmpty() && (lateQueue.size()<100))