Changeset 5187 for branches/ParallelEngine/HeuristicLab.Core/3.3/Engine.cs

Timestamp:

01/02/11 04:05:04 (14 years ago)

Author:

swagner

Message:

Worked on cancellation and refactored code (#1333)

File:

• branches/ParallelEngine/HeuristicLab.Core/3.3/Engine.cs (modified) (1 diff)

branches/ParallelEngine/HeuristicLab.Core/3.3/Engine.cs

@@ -93 +93 @@
         }
         catch (AggregateException ex) {
-          ex.Flatten().Handle(x => {
-            if (!(x is OperationCanceledException)) OnExceptionOccurred(x);
-            return true;
-          });
+          try {
+            ex.Flatten().Handle(x => x is OperationCanceledException);
+          }
+          catch (AggregateException remaining) {
+            if (remaining.InnerExceptions.Count == 1) OnExceptionOccurred(remaining.InnerExceptions[0]);
+            else OnExceptionOccurred(remaining);
+          }
         }
         cancellationTokenSource.Dispose();
         cancellationTokenSource = null;
-        if (stopRequested) {
-          executionStack.Clear();
-          OnStopped();
-        } else {
-          if (executionStack.Count == 0) OnStopped();
-          else OnPaused();
-        }
+        if (stopRequested) executionStack.Clear();
+        if (executionStack.Count == 0) OnStopped();
+        else OnPaused();
       });
     }