diff Implab/FuncChainTask.cs @ 149:eb793fbbe4ea v2

fixed promises cancellation
author cin
date Wed, 06 May 2015 17:11:27 +0300
parents 706fccb85524
children dd4a3590f9c6
line wrap: on
line diff
--- a/Implab/FuncChainTask.cs	Wed Apr 15 07:30:20 2015 +0300
+++ b/Implab/FuncChainTask.cs	Wed May 06 17:11:27 2015 +0300
@@ -4,14 +4,17 @@
     public class FuncChainTask<TResult> : FuncChainTaskBase<TResult>, IDeferred {
         readonly Func<IPromise<TResult>> m_task;
 
-        public FuncChainTask(Func<IPromise<TResult>> task, Func<Exception, IPromise<TResult>> error, Func<Exception, IPromise<TResult>> cancel) : base(error, cancel){
+        public FuncChainTask(Func<IPromise<TResult>> task, Func<Exception, IPromise<TResult>> error, Func<Exception, IPromise<TResult>> cancel, bool autoCancellable)
+            : base(error, cancel, autoCancellable) {
             m_task = task;
         }
 
         public void Resolve() {
             if (m_task != null && LockCancelation()) {
                 try {
-                    Observe(m_task());
+                    var operation = m_task();
+                    operation.On(SetResult, HandleErrorInternal, SetCancelled);
+                    CancellationRequested(operation.Cancel);
                 } catch (Exception err) {
                     HandleErrorInternal(err);
                 }