Changeset 9903 for stable

Timestamp:

08/23/13 10:28:07 (11 years ago)

Author:

ascheibe

Message:

#2097 merged r9902 into stable branch

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Clients.Hive/3.3/ConcurrentTaskDownloader.cs (modified) (3 diffs)

stable/HeuristicLab.Clients.Hive/3.3/ConcurrentTaskDownloader.cs

@@ -46 +46 @@
 
       task.ContinueWith((x) => OnTaskFinished(x, onFinishedAction), TaskContinuationOptions.ExecuteSynchronously | TaskContinuationOptions.OnlyOnRanToCompletion);
-      task.ContinueWith((x) => OnTaskFailed(x, onFinishedAction), TaskContinuationOptions.ExecuteSynchronously | TaskContinuationOptions.OnlyOnFaulted);
+      task.ContinueWith((x) => OnTaskFailed(x), TaskContinuationOptions.ExecuteSynchronously | TaskContinuationOptions.OnlyOnFaulted);
     }
 
@@ -55 +55 @@
 
       task.ContinueWith((x) => OnTaskFinished(x, onFinishedAction), TaskContinuationOptions.ExecuteSynchronously | TaskContinuationOptions.OnlyOnRanToCompletion);
-      task.ContinueWith((x) => OnTaskFailed(x, onFinishedAction), TaskContinuationOptions.ExecuteSynchronously | TaskContinuationOptions.OnlyOnFaulted);
+      task.ContinueWith((x) => OnTaskFailed(x), TaskContinuationOptions.ExecuteSynchronously | TaskContinuationOptions.OnlyOnFaulted);
     }
 
@@ -61 +61 @@
       onFinishedAction(task.Result.Item1, task.Result.Item2);
     }
-    private void OnTaskFailed(Task<Tuple<Task, T>> task, Action<Task, T> onFinishedAction) {
+    private void OnTaskFailed(Task<Tuple<Task, T>> task) {
       task.Exception.Flatten().Handle((e) => { return true; });
       OnExceptionOccured(task.Exception.Flatten());
-      onFinishedAction(task.Result.Item1, null);
     }