Merge pull request #901 from Blewzman/FixAggregateExceptionGetBaseException

[mono.git] / mcs / class / corlib / System.Runtime.CompilerServices / AsyncTaskMethodBuilder_T.cs

diff --git a/mcs/class/corlib/System.Runtime.CompilerServices/AsyncTaskMethodBuilder_T.cs b/mcs/class/corlib/System.Runtime.CompilerServices/AsyncTaskMethodBuilder_T.cs
index f955d6b9fd57a3cfbe4b94965d9635bf5c3d0b4d..9d539dfc42dc4f5bc56c71e5d94b8371432b5298 100644 (file)
--- a/mcs/class/corlib/System.Runtime.CompilerServices/AsyncTaskMethodBuilder_T.cs
+++ b/mcs/class/corlib/System.Runtime.CompilerServices/AsyncTaskMethodBuilder_T.cs
@@ -69,20 +69,15 @@ namespace System.Runtime.CompilerServices
                
                public static AsyncTaskMethodBuilder<TResult> Create ()
                {
-                       var task = new Task<TResult> (TaskActionInvoker.Empty, null, CancellationToken.None, TaskCreationOptions.None, null);
+                       var task = new Task<TResult> (TaskActionInvoker.Promise, null, CancellationToken.None, TaskCreationOptions.None, null);
                        task.SetupScheduler (TaskScheduler.Current);
                        return new AsyncTaskMethodBuilder<TResult> (task);
                }
 
                public void SetException (Exception exception)
                {
-                       if (exception is OperationCanceledException) {
-                               if (Task.TrySetCanceled ())
-                                       return;
-                       } else {
-                               if (Task.TrySetException (new AggregateException (exception)))
-                                       return;
-                       }
+                       if (Task.TrySetException (new AggregateException (exception), exception is OperationCanceledException, true))
+                               return;
 
                        throw new InvalidOperationException ("The task has already completed");
                }