Changeset 15384 for stable/HeuristicLab.Algorithms.Benchmarks

Timestamp:

09/28/17 08:04:05 (7 years ago)

Author:

jkarder

Message:

#2830: merged r15367 into stable

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Algorithms.Benchmarks/3.3/BenchmarkAlgorithm.cs (modified) (1 diff)

stable/HeuristicLab.Algorithms.Benchmarks/3.3/BenchmarkAlgorithm.cs ¶

@@ -312 +312 @@
       } catch (OperationCanceledException) {
       } catch (AggregateException ae) {
-        OnExceptionOccurred(ae.InnerExceptions.SingleOrDefault() ?? ae);
+        ae.FlattenAndHandle(new[] { typeof(OperationCanceledException) }, e => OnExceptionOccurred(e));
       } catch (Exception e) {
         OnExceptionOccurred(e);