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

Jean-Noel Rouvignac
17.46.2013 06114fba6a18eab64d6a6371a1c3966f387aff5a
opendj-sdk/opends/src/server/org/opends/server/replication/server/changelog/je/DraftCNDB.java
@@ -31,7 +31,6 @@
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
import org.opends.messages.Message;
import org.opends.messages.MessageBuilder;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.replication.server.changelog.api.CNIndexRecord;
@@ -398,10 +397,12 @@
            // We could not move the cursor to the expected startChangeNumber
            if (localCursor.getSearchKeyRange(key, entry, DEFAULT) != SUCCESS)
            {
              // We could not even move the cursor close to it => failure
              throw new ChangelogException(
                  Message.raw("ChangeLog Change Number " + startChangeNumber
                      + " is not available"));
              // We could not even move the cursor close to it
              // => return an empty cursor
              isClosed = true;
              txn = null;
              cursor = null;
              return;
            }
            if (localCursor.getPrev(key, entry, LockMode.DEFAULT) != SUCCESS)
opendj-sdk/opends/src/server/org/opends/server/replication/server/changelog/je/DraftCNDbIterator.java
@@ -29,8 +29,10 @@
import org.opends.messages.Message;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.replication.server.changelog.api.*;
import org.opends.server.replication.server.changelog.je.DraftCNDB.*;
import org.opends.server.replication.server.changelog.api.CNIndexRecord;
import org.opends.server.replication.server.changelog.api.ChangeNumberIndexDBCursor;
import org.opends.server.replication.server.changelog.api.ChangelogException;
import org.opends.server.replication.server.changelog.je.DraftCNDB.DraftCNDBCursor;
import org.opends.server.types.DebugLogLevel;
import static org.opends.server.loggers.debug.DebugLogger.*;
@@ -59,9 +61,10 @@
      throws ChangelogException
  {
    draftCNDbCursor = db.openReadCursor(startChangeNumber);
    if (draftCNDbCursor == null)
    if (draftCNDbCursor.currentRecord() == null)
    {
      throw new ChangelogException(Message.raw("no new change"));
      throw new ChangelogException(Message.raw("Change Number "
          + startChangeNumber + " is not available in the Changelog"));
    }
  }