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

Jean-Noel Rouvignac
21.33.2013 2bab8946d210e6795e98ae6277a1e9f102d15458
Checkpoint commit for OPENDJ-1174 Transfer responsibility for populating the ChangeNumberIndexDB to ChangelogDB 

JEChangelogDB.java:
Consequence of the changes to CompositeDBCursor and ReplicationDomainDB in r9820 .
1 files modified
12 ■■■■■ changed files
opends/src/server/org/opends/server/replication/server/changelog/je/JEChangelogDB.java 12 ●●●●● patch | view | raw | blame | history
opends/src/server/org/opends/server/replication/server/changelog/je/JEChangelogDB.java
@@ -688,18 +688,20 @@
      ServerState startAfterServerState) throws ChangelogException
  {
    final Set<Integer> serverIds = getDomainMap(baseDN).keySet();
    final List<DBCursor<UpdateMsg>> cursors =
        new ArrayList<DBCursor<UpdateMsg>>(serverIds.size());
    final Map<DBCursor<UpdateMsg>, Void> cursors =
        new HashMap<DBCursor<UpdateMsg>, Void>(serverIds.size());
    for (int serverId : serverIds)
    {
      // get the last already sent CSN from that server to get a cursor
      final CSN lastCSN = startAfterServerState.getCSN(serverId);
      cursors.add(getCursorFrom(baseDN, serverId, lastCSN));
      cursors.put(getCursorFrom(baseDN, serverId, lastCSN), null);
    }
    return new CompositeDBCursor(cursors);
    return new CompositeDBCursor<Void>(cursors);
  }
  private DBCursor<UpdateMsg> getCursorFrom(DN baseDN, int serverId,
  /** {@inheritDoc} */
  @Override
  public DBCursor<UpdateMsg> getCursorFrom(DN baseDN, int serverId,
      CSN startAfterCSN) throws ChangelogException
  {
    JEReplicaDB replicaDB = getReplicaDB(baseDN, serverId);