Changeset 13908 for stable

Timestamp:

06/17/16 14:04:15 (9 years ago)

Author:

ascheibe

Message:

#2562 merged r13516 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

@@ -966 +966 @@
           || task.Command == DA.Command.Stop && task.State == DA.TaskState.Aborted) {
         task.Command = null;
-      } else if (taskStateEntity == DA.TaskState.Paused && task.Command != null) {
+      } else if (taskStateEntity == DA.TaskState.Paused && task.Command == null) {
         // slave paused and uploaded the task (no user-command) -> set waiting.
         taskStateEntity = DA.TaskState.Waiting;