Changeset 15385

Timestamp:

09/28/17 08:05:50 (7 years ago)

Author:

jkarder

Message:

#2833: merged r15358 into stable

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Services.Hive (modified) (1 prop)
• HeuristicLab.Services.Hive/3.3/HiveService.cs (modified) (1 diff)

stable/HeuristicLab.Services.Hive/3.3/HiveService.cs

@@ -967 +967 @@
       var taskStateEntity = taskState.ToEntity();
 
-      if (task.State == DA.TaskState.Calculating && taskStateEntity == DA.TaskState.Paused && task.Command == null) {
+      if (task.State == DA.TaskState.Transferring && taskStateEntity == DA.TaskState.Paused && task.Command == null) {
         // slave paused and uploaded the task (no user-command) -> set waiting.
         taskStateEntity = DA.TaskState.Waiting;