Changeset 15384 for stable/HeuristicLab.Common

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.Common/3.3/AsyncHelper.cs (modified) (2 diffs)
• HeuristicLab.Common/3.3/ExceptionExtensions.cs (copied) (copied from trunk/sources/HeuristicLab.Common/3.3/ExceptionExtensions.cs)
• HeuristicLab.Common/3.3/HeuristicLab.Common-3.3.csproj (modified) (1 diff)

stable/HeuristicLab.Common/3.3/AsyncHelper.cs

@@ -21 +21 @@
 
 using System;
-using System.Linq;
 using System.Runtime.ExceptionServices;
 using System.Threading;
@@ -38 +37 @@
       } catch (OperationCanceledException) {
       } catch (AggregateException ae) {
-        var e = ae.InnerExceptions.SingleOrDefault() ?? ae;
-        ExceptionDispatchInfo.Capture(e).Throw();
+        ae.FlattenAndHandle(new[] { typeof(OperationCanceledException) }, e => ExceptionDispatchInfo.Capture(e).Throw());
       }
     }

stable/HeuristicLab.Common/3.3/HeuristicLab.Common-3.3.csproj

@@ -132 +132 @@
     <Compile Include="Constants.cs" />
     <Compile Include="ArrayExtensions.cs" />
+    <Compile Include="ExceptionExtensions.cs" />
     <Compile Include="Statistics\EmpiricalCumulativeDistributionFunction.cs" />
     <Compile Include="ListExtensions.cs" />