- attempt to fix possible race condition that might occur when scheduled ta...

abobrov

19.48.2009 7e83f81a531a47f29c7bf828c56a38dcbf96f286

 opends/src/server/org/opends/server/backends/task/TaskThread.java

@@ -193,9 +193,10 @@
        continue;
      }

      TaskState taskState = getAssociatedTask().getTaskState();
      try
      {
        if (!TaskState.isDone(getAssociatedTask().getTaskState()))
        if (!TaskState.isDone(taskState))
        {
          Task task = getAssociatedTask();

@@ -203,8 +204,7 @@
            task.getDisplayName(), task.getTaskID());
          logError(message);

          TaskState returnState = task.execute();
          task.setTaskState(returnState);
          taskState = task.execute();

          message = NOTE_TASK_FINISHED.get(
            task.getDisplayName(), task.getTaskID());
@@ -229,7 +229,7 @@

      Task completedTask = getAssociatedTask();
      setAssociatedTask(null);
      if (! taskScheduler.threadDone(this, completedTask))
      if (! taskScheduler.threadDone(this, completedTask, taskState))
      {
        exitRequested = true;
        break;
@@ -239,8 +239,8 @@
    if (getAssociatedTask() != null)
    {
      Task task = getAssociatedTask();
      task.setTaskState(TaskState.STOPPED_BY_SHUTDOWN);
      taskScheduler.threadDone(this, task);
      TaskState taskState = TaskState.STOPPED_BY_SHUTDOWN;
      taskScheduler.threadDone(this, task, taskState);
    }
  }