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

Matthew Swift
25.16.2016 3fb44e4754676279210c044c58bbc7e4cf1524ee
opendj-server-legacy/src/main/java/org/opends/server/config/ConfigurationHandler.java
@@ -85,7 +85,6 @@
import org.forgerock.opendj.ldif.LDIFEntryReader;
import org.forgerock.opendj.ldif.LDIFEntryWriter;
import org.forgerock.util.Utils;
import org.forgerock.util.annotations.VisibleForTesting;
import org.opends.server.api.AlertGenerator;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.SearchOperation;
@@ -207,8 +206,7 @@
   * @throws InitializationException
   *           If an error occurs.
   */
  @VisibleForTesting
  void initializeWithPartialSchema() throws InitializationException
  private void initializeWithPartialSchema() throws InitializationException
  {
    File configFileToUse = preInitialization();
    Schema configEnabledSchema = loadSchemaWithConfigurationEnabled();
@@ -697,7 +695,7 @@
    try (LDIFEntryWriter writer = new LDIFEntryWriter(exportConfig.getWriter()))
    {
      writer.writeComment(INFO_CONFIG_FILE_HEADER.get().toString());
      for (Entry entry : new ArrayList<Entry>(backend.getAll()))
      for (Entry entry : new ArrayList<>(backend.getAll()))
      {
        try
        {
@@ -1189,7 +1187,7 @@
      fileToUse = standardConfigFile;
    }
    boolean fileExists = false;
    boolean fileExists;
    try
    {
      fileExists = fileToUse.exists();
@@ -1469,12 +1467,11 @@
            latestFileName = name;
            latestTimestamp = timestamp;
            latestCounter = 0;
            continue;
          }
        }
        catch (Exception e)
        {
          continue;
          // Ignore.
        }
      }
      else
@@ -1491,12 +1488,11 @@
            latestFileName = name;
            latestTimestamp = timestamp;
            latestCounter = counter;
            continue;
          }
        }
        catch (Exception e)
        {
          continue;
          // Ignore.
        }
      }
    }