Issue 2368: tasks should be interruptable. The four schedulable task (impo...

kenneth_suter

16.19.2007 eee90cc3e34f4e5a7d562ee9e60c66a61816985c

 opends/src/server/org/opends/server/tasks/ImportTask.java

@@ -26,6 +26,7 @@
 */
package org.opends.server.tasks;
import org.opends.messages.Message;
import org.opends.messages.TaskMessages;

import static org.opends.messages.TaskMessages.*;
import static org.opends.messages.ToolMessages.*;
@@ -169,6 +170,7 @@
  ArrayList<String>  includeFilterStrings    = null;
  ArrayList<String>  ldifFiles               = null;

  private LDIFImportConfig importConfig;

  /**
   * {@inheritDoc}
@@ -482,6 +484,30 @@
  }


  /**
   * {@inheritDoc}
   */
  public void interruptTask(TaskState interruptState, Message interruptReason)
  {
    if (TaskState.STOPPED_BY_ADMINISTRATOR.equals(interruptState) &&
            importConfig != null)
    {
      addLogMessage(TaskMessages.INFO_TASK_STOPPED_BY_ADMIN.get(
              interruptReason));
      setTaskInterruptState(interruptState);
      importConfig.cancel();
    }
  }


  /**
   * {@inheritDoc}
   */
  public boolean isInterruptable()
  {
    return true;
  }


  /**
   * {@inheritDoc}
@@ -731,7 +757,7 @@

    // Create the LDIF import configuration to use when reading the LDIF.
    ArrayList<String> fileList = new ArrayList<String>(ldifFiles);
    LDIFImportConfig importConfig = new LDIFImportConfig(fileList);
    importConfig = new LDIFImportConfig(fileList);
    importConfig.setAppendToExistingData(append);
    importConfig.setReplaceExistingEntries(replaceExisting);
    importConfig.setCompressed(isCompressed);
@@ -942,6 +968,6 @@

    // Clean up after the import by closing the import config.
    importConfig.close();
    return TaskState.COMPLETED_SUCCESSFULLY;
    return getFinalTaskState();
  }
}