Changeset 9078 for branches/RuntimeOptimizer/HeuristicLab.Clients.Hive/3.3
- Timestamp:
- 12/19/12 11:16:51 (12 years ago)
- Location:
- branches/RuntimeOptimizer
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/RuntimeOptimizer
- Property svn:mergeinfo changed
/trunk/sources merged: 8972-8974,8976,8978-8994,8999-9019,9021-9031,9033-9039,9043,9049,9052,9055-9057,9063,9068,9072,9075-9076
- Property svn:mergeinfo changed
-
branches/RuntimeOptimizer/HeuristicLab.Clients.Hive/3.3/RefreshableJob.cs
r8939 r9078 267 267 if (hiveTask != null) { 268 268 // lastJobDataUpdate equals DateTime.MinValue right after it was uploaded. When the first results are polled, this value is updated 269 if (hiveTask.Task.State == TaskState.Offline && lightweightTask.State != TaskState.Finished && lightweightTask.State != TaskState.Failed && lightweightTask.State != TaskState.Aborted) {269 if (hiveTask.Task.State == TaskState.Offline && lightweightTask.State == TaskState.Waiting) { 270 270 hiveTask.Task.LastTaskDataUpdate = lightweightTask.LastTaskDataUpdate; 271 271 } … … 273 273 hiveTask.UpdateFromLightweightJob(lightweightTask); 274 274 275 if (!hiveTask.IsFinishedTaskDownloaded && !hiveTask.IsDownloading && hiveTask.Task.LastTaskDataUpdate < lightweightTask.LastTaskDataUpdate ) {275 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)) { 276 276 log.LogMessage(string.Format("Downloading task {0}", lightweightTask.Id)); 277 277 hiveTask.IsDownloading = true; … … 302 302 }); 303 303 } 304 } else 305 throw new Exception("This should not happen"); 304 } 306 305 } 307 306 GC.Collect(); // force GC, because .NET is too lazy here (deserialization takes a lot of memory)
Note: See TracChangeset
for help on using the changeset viewer.