Changeset 9429

Timestamp:

05/02/13 15:36:39 (12 years ago)

Author:

mkommend

Message:

#2024: Added support for CancellationToken in the ParallelEngine.

File:

• trunk/sources/HeuristicLab.ParallelEngine/3.3/ParallelEngine.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.ParallelEngine/3.3/ParallelEngine.cs

@@ -77 +77 @@
       parallelOptions = new ParallelOptions();
       parallelOptions.MaxDegreeOfParallelism = DegreeOfParallelism;
+      parallelOptions.CancellationToken = cancellationToken;
       Run(ExecutionStack);
     }
@@ -101 +102 @@
               Parallel.ForEach(stacks, parallelOptions, Run);
             }
-            catch (AggregateException ex) {
+            catch (OperationCanceledException ex) {
               OperationCollection remaining = new OperationCollection() { Parallel = true };
               for (int i = 0; i < stacks.Length; i++) {