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

pgamba
07.36.2007 86847c52855283d5e7092f8edab36e836929baad
opendj-sdk/opends/src/server/org/opends/server/replication/plugin/ReplicationDomain.java
@@ -107,6 +107,7 @@
import org.opends.server.tasks.InitializeTargetTask;
import org.opends.server.tasks.InitializeTask;
import org.opends.server.tasks.TaskUtils;
import org.opends.server.types.ExistingFileBehavior;
import org.opends.server.types.AbstractOperation;
import org.opends.server.types.Attribute;
import org.opends.server.types.AttributeType;
@@ -2211,6 +2212,15 @@
  }
  /**
   * Get the server ID.
   * @return The server ID.
   */
  public int getServerId()
  {
    return serverId;
  }
  /**
   * Check if the domain solve conflicts.
   *
   * @return a boolean indicating if the domain should sove conflicts.
@@ -3175,8 +3185,8 @@
        importConfig.setAppendToExistingData(false);
        // TODO How to deal with rejected entries during the import
        // importConfig.writeRejectedEntries("rejectedImport",
        // ExistingFileBehavior.OVERWRITE);
        importConfig.writeRejectedEntries("rejectedImport",
         ExistingFileBehavior.OVERWRITE);
        // Process import
        backend.importLDIF(importConfig);