Changeset 8993

Timestamp:

12/04/12 11:10:50 (11 years ago)

Author:

ascheibe

Message:

#1950 fixed downloading of the wrong number of runs

File:

• trunk/sources/HeuristicLab.Clients.Hive/3.3/RefreshableJob.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Clients.Hive/3.3/RefreshableJob.cs

@@ -267 +267 @@
           if (hiveTask != null) {
             // lastJobDataUpdate equals DateTime.MinValue right after it was uploaded. When the first results are polled, this value is updated
-            if (hiveTask.Task.State == TaskState.Offline && lightweightTask.State != TaskState.Finished && lightweightTask.State != TaskState.Failed && lightweightTask.State != TaskState.Aborted) {
+            if (hiveTask.Task.State == TaskState.Offline && lightweightTask.State == TaskState.Waiting) {
               hiveTask.Task.LastTaskDataUpdate = lightweightTask.LastTaskDataUpdate;
             }
@@ -273 +273 @@
             hiveTask.UpdateFromLightweightJob(lightweightTask);
 
-            if (!hiveTask.IsFinishedTaskDownloaded && !hiveTask.IsDownloading && hiveTask.Task.LastTaskDataUpdate < lightweightTask.LastTaskDataUpdate) {
+            if (!hiveTask.IsFinishedTaskDownloaded && !hiveTask.IsDownloading && hiveTask.Task.LastTaskDataUpdate < lightweightTask.LastTaskDataUpdate && (lightweightTask.State == TaskState.Finished || lightweightTask.State == TaskState.Aborted || lightweightTask.State == TaskState.Failed || lightweightTask.State == TaskState.Paused)) {
               log.LogMessage(string.Format("Downloading task {0}", lightweightTask.Id));
               hiveTask.IsDownloading = true;