DraftCNData.java: In the constructor, directly accept a DN instead of a Str...

Jean-Noel Rouvignac

05.11.2015 ead731ef84bdb9063e51da276272c235afa955dc

DraftCNData.java:
In the constructor, directly accept a DN instead of a String + changed client code in DraftCNDB.

 opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/DraftCNDB.java

@@ -26,21 +26,22 @@
 */
package org.opends.server.replication.server.changelog.je;

import java.io.Closeable;
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;

import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.replication.server.changelog.api.*;

import com.sleepycat.je.*;

import static com.sleepycat.je.LockMode.*;
import static com.sleepycat.je.OperationStatus.*;

import static org.opends.messages.ReplicationMessages.*;
import static org.opends.server.util.StaticUtils.*;

import java.io.Closeable;
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;

import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.replication.server.changelog.api.ChangeNumberIndexRecord;
import org.opends.server.replication.server.changelog.api.ChangelogException;

import com.sleepycat.je.*;

/**
 * This class implements the interface between the underlying database
 * and the {@link JEChangeNumberIndexDB} class.
@@ -88,7 +89,7 @@
    {
      final long changeNumber = record.getChangeNumber();
      DatabaseEntry key = new ReplicationDraftCNKey(changeNumber);
      DatabaseEntry data = new DraftCNData(changeNumber, record.getBaseDN().toString(), record.getCSN());
      DatabaseEntry data = new DraftCNData(changeNumber, record.getBaseDN(), record.getCSN());

      // Use a transaction so that we can override durability.
      Transaction txn = null;

 opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/DraftCNData.java

@@ -22,31 +22,30 @@
 *
 *
 *      Copyright 2009 Sun Microsystems, Inc.
 *      Portions Copyright 2010-2014 ForgeRock AS.
 *      Portions Copyright 2010-2015 ForgeRock AS.
 */
package org.opends.server.replication.server.changelog.je;

import static org.opends.server.util.StaticUtils.*;

import java.io.UnsupportedEncodingException;

import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.replication.common.CSN;
import org.opends.server.replication.server.changelog.api.*;
import org.opends.server.replication.server.changelog.api.ChangeNumberIndexRecord;
import org.opends.server.replication.server.changelog.api.ChangelogException;
import org.opends.server.types.DN;
import org.opends.server.types.DirectoryException;

import com.sleepycat.je.DatabaseEntry;

import static org.opends.server.util.StaticUtils.*;

/**
 * SuperClass of DatabaseEntry used for data stored in the DraftCNDB.
 * Subclass of DatabaseEntry used for data stored in the DraftCNDB.
 */
public class DraftCNData extends DatabaseEntry
{
  private static final String FIELD_SEPARATOR = "!";

  private static final String EMPTY_STRING_PREVIOUS_COOKIE = "";

  private static final long serialVersionUID = 1L;

  private long changeNumber;
@@ -62,7 +61,7 @@
   * @param csn
   *          The replication CSN
   */
  public DraftCNData(long changeNumber, String baseDN, CSN csn)
  public DraftCNData(long changeNumber, DN baseDN, CSN csn)
  {
    this.changeNumber = changeNumber;
    // Although the previous cookie is not used any more, we need