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

Jean-Noel Rouvignac
20.07.2014 f8312ee683a16eac82ef43a9c4144162100d7658
OPENDJ-1271 (CR-3008) dsreplication pre-external-initialization task fails with STOPPED_BY_ERROR

ReplicationDomain.java:
Renamed inner class IEContext to ImportExportContext.
Renamed fields ieContext to importExportContext.
Renamed isRemoteDSConnected() to getConnectedRemoteDS().
1 files modified
15 ■■■■ changed files
opends/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java 15 ●●●● patch | view | raw | blame | history
opends/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java
@@ -1500,7 +1500,7 @@
    // process:
    // This is an error termination during the import
    // The error is stored and the import is ended by returning null
    final IEContext ieCtx = getImportExportContext();
    final ImportExportContext ieCtx = getImportExportContext();
    Message msg = null;
    switch (importErrorMessageId)
    {
@@ -3715,16 +3715,16 @@
    Backend backend = getBackend();
    IEContext ieCtx = getImportExportContext();
    ImportExportContext ieCtx = getImportExportContext();
    try
    {
      if (!backend.supportsLDIFImport())
      {
        ieCtx.setExceptionIfNoneSet(new DirectoryException(OTHER,
            ERR_INIT_IMPORT_NOT_SUPPORTED.get(backend.getBackendID())));
        return;
      }
      else
      {
        importConfig = new LDIFImportConfig(input);
        List<DN> includeBranches = new ArrayList<DN>();
        includeBranches.add(getBaseDN());
@@ -3739,9 +3739,9 @@
        importErrorMessageId = -1;
        // TODO How to deal with rejected entries during the import
        importConfig.writeRejectedEntries(
            getFileForPath("logs" + File.separator +
            "replInitRejectedEntries").getAbsolutePath(),
      File rejectsFile =
          getFileForPath("logs" + File.separator + "replInitRejectedEntries");
      importConfig.writeRejectedEntries(rejectsFile.getAbsolutePath(),
            ExistingFileBehavior.OVERWRITE);
        // Process import
@@ -3750,7 +3750,6 @@
        stateSavingDisabled = false;
      }
    }
    catch(Exception e)
    {
      ieCtx.setExceptionIfNoneSet(new DirectoryException(ResultCode.OTHER,