Changeset 6200 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/ExperimentManager/ConcurrentJobDownloader.cs

Timestamp:

05/16/11 00:18:48 (13 years ago)

Author:

cneumuel

Message:

#1233

• stability improvements for HiveEngine

File:

• branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/ExperimentManager/ConcurrentJobDownloader.cs (modified) (1 diff)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/ExperimentManager/ConcurrentJobDownloader.cs

@@ -21 +21 @@
 
     public void DownloadJob(Job job, Action<Job, T, Exception> onFinishedAction) {
-      Task<JobData>.Factory.StartNew((x) => DownloadJob(x), job.Id)
-                                     .ContinueWith((x) => DeserializeJob(x.Result))
-                                     .ContinueWith((x) => OnJobFinished(job, x, onFinishedAction), TaskContinuationOptions.ExecuteSynchronously);
+      Task<T> task = Task<JobData>.Factory.StartNew((x) => DownloadJob(x), job.Id)
+                                     .ContinueWith((x) => DeserializeJob(x.Result));
+      task.ContinueWith((x) => OnJobFinished(job, x, onFinishedAction), TaskContinuationOptions.ExecuteSynchronously | TaskContinuationOptions.OnlyOnRanToCompletion);
+      task.ContinueWith((x) => OnJobFailed(job, x, onFinishedAction), TaskContinuationOptions.ExecuteSynchronously | TaskContinuationOptions.OnlyOnFaulted);
     }
 
     private void OnJobFinished(Job job, Task<T> task, Action<Job, T, Exception> onFinishedAction) {
-      onFinishedAction(job, task.Result, task.Exception);
+      onFinishedAction(job, task.Result, null);
+    }
+    private void OnJobFailed(Job job, Task<T> task, Action<Job, T, Exception> onFinishedAction) {
+      onFinishedAction(job, task.Result, task.Exception.Flatten());
     }