AutoRefactor: collapse if statements

Jean-Noel Rouvignac

18.26.2015 ca669ae54f86dbeea277280690584d9f591c7571

 opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/BackupManager.java

@@ -205,13 +205,10 @@

    if (incremental)
    {
      if (incrBaseID == null)
      if (incrBaseID == null && backupDir.getLatestBackup() != null)
      {
        // The default is to use the latest backup as base.
        if (backupDir.getLatestBackup() != null)
        {
          incrBaseID = backupDir.getLatestBackup().getBackupID();
        }
        incrBaseID = backupDir.getLatestBackup().getBackupID();
      }

      if (incrBaseID == null)
@@ -897,12 +894,9 @@
      // See if we need to restore the file.
      File file = new File(restoreDir, name);
      OutputStream outputStream = null;
      if (includeFiles == null || includeFiles.contains(zipEntry.getName()))
      if ((includeFiles == null || includeFiles.contains(zipEntry.getName())) && !verifyOnly)
      {
        if (!verifyOnly)
        {
          outputStream = new FileOutputStream(file);
        }
        outputStream = new FileOutputStream(file);
      }

      if (outputStream != null || mac != null || digest != null)
@@ -963,14 +957,11 @@
    zipStream.close();

    // Check the hash.
    if (digest != null)
    if (digest != null && !Arrays.equals(digest.digest(), hash))
    {
      if (!Arrays.equals(digest.digest(), hash))
      {
        LocalizableMessage message = ERR_JEB_BACKUP_UNSIGNED_HASH_ERROR.get(backupID);
        throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
                                     message);
      }
      LocalizableMessage message = ERR_JEB_BACKUP_UNSIGNED_HASH_ERROR.get(backupID);
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
                                   message);
    }

    if (mac != null)