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

Jean-Noel Rouvignac
23.54.2015 b475afad809df9cb1a12aa737ee1a04a3db1be2b
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/BackendImpl.java
@@ -667,8 +667,8 @@
    }
    for (DN dn : cfg.getBaseDN())
    {
      ImportSuffixCommand openMethod = new ImportSuffixCommand(dn, importConfig);
      if (openMethod.getSuffixImportStrategy() == SuffixImportStrategy.MERGE_DB_WITH_LDIF)
      ImportSuffixCommand importCommand = new ImportSuffixCommand(dn, importConfig);
      if (importCommand.getSuffixImportStrategy() == SuffixImportStrategy.MERGE_DB_WITH_LDIF)
      {
        // fail-fast to avoid ending up in an unrecoverable state for the server
        throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, ERR_IMPORT_UNSUPPORTED_WITH_BRANCH.get());