# HG changeset patch
# User cin
# Date 1472501751 -10800
# Node ID 40d7fed4a09eea66f914d5407ad4d0b7956ca6b9
# Parent  0d69c0d6de0d1f026c900fcd75f61605f2333dce
fixed promise chaining behavior, the error handler doesn't handle result or cancellation handlers exceptions these exceptions are propagated to the next handlers.

diff -r 0d69c0d6de0d -r 40d7fed4a09e Implab.Test/RunnableComponentTests.cs
--- a/Implab.Test/RunnableComponentTests.cs	Fri Apr 22 13:13:08 2016 +0300
+++ b/Implab.Test/RunnableComponentTests.cs	Mon Aug 29 23:15:51 2016 +0300
@@ -132,7 +132,7 @@
             ShouldThrow(() => p.Join(1000));
             Assert.AreEqual(ExecutionState.Failed, comp.State);
 
-            Assert.IsInstanceOfType(comp.LastError, typeof(OperationCanceledException));
+            Assert.IsTrue(comp.LastError is OperationCanceledException);
 
             comp.Dispose();
         }
@@ -185,7 +185,7 @@
             p.Cancel();
             ShouldThrow(() => p.Join(1000));
             Assert.AreEqual(ExecutionState.Failed, comp.State);
-            Assert.IsInstanceOfType(comp.LastError, typeof(OperationCanceledException));
+            Assert.IsTrue(comp.LastError is OperationCanceledException);
 
             comp.Dispose();
         }
diff -r 0d69c0d6de0d -r 40d7fed4a09e Implab/ActionChainTask.cs
--- a/Implab/ActionChainTask.cs	Fri Apr 22 13:13:08 2016 +0300
+++ b/Implab/ActionChainTask.cs	Mon Aug 29 23:15:51 2016 +0300
@@ -23,10 +23,8 @@
                     var p = m_task();
                     p.On(SetResult, HandleErrorInternal, HandleCancelInternal);
                     CancellationRequested(p.Cancel);
-                } catch (OperationCanceledException reason){
-                    HandleCancelInternal(reason);
                 } catch(Exception err) {
-                    HandleErrorInternal(err);
+                    SetErrorInternal(err);
                 }
             }
         }
diff -r 0d69c0d6de0d -r 40d7fed4a09e Implab/ActionChainTaskBase.cs
--- a/Implab/ActionChainTaskBase.cs	Fri Apr 22 13:13:08 2016 +0300
+++ b/Implab/ActionChainTaskBase.cs	Mon Aug 29 23:15:51 2016 +0300
@@ -36,10 +36,10 @@
                     // отдавать ли результат или подтвердить отмену (или вернуть ошибку).
                     CancellationRequested(p.Cancel);
                 } catch (Exception err) {
-                    HandleErrorInternal(err);
+                    SetErrorInternal(err);
                 }
             } else {
-                HandleErrorInternal(reason ?? new OperationCanceledException());
+                SetCancelledInternal(reason);
             }
         }
 
diff -r 0d69c0d6de0d -r 40d7fed4a09e Implab/ActionChainTaskT.cs
--- a/Implab/ActionChainTaskT.cs	Fri Apr 22 13:13:08 2016 +0300
+++ b/Implab/ActionChainTaskT.cs	Mon Aug 29 23:15:51 2016 +0300
@@ -14,10 +14,8 @@
                     var p = m_task(value);
                     p.On(SetResult, HandleErrorInternal, HandleCancelInternal);
                     CancellationRequested(p.Cancel);
-                } catch (OperationCanceledException reason) {
-                    HandleCancelInternal(reason);
                 } catch(Exception err) {
-                    HandleErrorInternal(err);
+                    SetErrorInternal(err);
                 }
             }
         }
diff -r 0d69c0d6de0d -r 40d7fed4a09e Implab/ActionTask.cs
--- a/Implab/ActionTask.cs	Fri Apr 22 13:13:08 2016 +0300
+++ b/Implab/ActionTask.cs	Mon Aug 29 23:15:51 2016 +0300
@@ -12,10 +12,8 @@
                 try {
                     m_task();
                     SetResult();
-                } catch(OperationCanceledException reason) {
-                    HandleCancelInternal(reason);
                 } catch(Exception err) {
-                    HandleErrorInternal(err);
+                    SetErrorInternal(err);
                 }
             }
         }
diff -r 0d69c0d6de0d -r 40d7fed4a09e Implab/ActionTaskBase.cs
--- a/Implab/ActionTaskBase.cs	Fri Apr 22 13:13:08 2016 +0300
+++ b/Implab/ActionTaskBase.cs	Mon Aug 29 23:15:51 2016 +0300
@@ -42,10 +42,10 @@
                     m_cancel(error);
                     SetResult();
                 } catch(Exception err) {
-                    HandleErrorInternal(err);
+                    SetErrorInternal(err);
                 }
             } else {
-                HandleErrorInternal(error ?? new OperationCanceledException());
+                SetCancelledInternal(error);
             }
         }
     }
diff -r 0d69c0d6de0d -r 40d7fed4a09e Implab/ActionTaskT.cs
--- a/Implab/ActionTaskT.cs	Fri Apr 22 13:13:08 2016 +0300
+++ b/Implab/ActionTaskT.cs	Mon Aug 29 23:15:51 2016 +0300
@@ -12,10 +12,8 @@
                 try {
                     m_task(value);
                     SetResult();
-                } catch(OperationCanceledException reason) {
-                    HandleCancelInternal(reason);
                 } catch(Exception err) {
-                    HandleErrorInternal(err);
+                    SetErrorInternal(err);
                 }
             }
         }
diff -r 0d69c0d6de0d -r 40d7fed4a09e Implab/Components/RunnableComponent.cs
--- a/Implab/Components/RunnableComponent.cs	Fri Apr 22 13:13:08 2016 +0300
+++ b/Implab/Components/RunnableComponent.cs	Mon Aug 29 23:15:51 2016 +0300
@@ -120,6 +120,20 @@
             
                 prev = m_pending;
 
+                Action<Exception> errorOrCancel = e => {
+                    if (e == null)
+                        e = new OperationCanceledException();
+                    
+                    lock (m_stateMachine) {
+                        if (m_pending == promise) {
+                            Move(Commands.Fail);
+                            m_pending = null;
+                            m_lastError = e;
+                        }
+                    }
+                    throw new PromiseTransientException(e);
+                };
+
                 promise = task.Then(
                     () => {
                         lock(m_stateMachine) {
@@ -128,16 +142,9 @@
                                 m_pending = null;
                             }
                         }
-                    }, e => {
-                        lock(m_stateMachine) {
-                            if (m_pending == promise) {
-                                Move(Commands.Fail);
-                                m_pending = null;
-                                m_lastError = e;
-                            }
-                        }
-                        throw new PromiseTransientException(e);
-                    }
+                    },
+                    errorOrCancel,
+                    errorOrCancel 
                 );
 
                 m_pending = promise;
diff -r 0d69c0d6de0d -r 40d7fed4a09e Implab/FuncChainTask.cs
--- a/Implab/FuncChainTask.cs	Fri Apr 22 13:13:08 2016 +0300
+++ b/Implab/FuncChainTask.cs	Mon Aug 29 23:15:51 2016 +0300
@@ -15,10 +15,8 @@
                     var operation = m_task();
                     operation.On(SetResult, HandleErrorInternal, HandleCancelInternal);
                     CancellationRequested(operation.Cancel);
-                } catch (OperationCanceledException reason) {
-                    HandleCancelInternal(reason);
                 } catch (Exception err) {
-                    HandleErrorInternal(err);
+                    SetErrorInternal(err);
                 }
             }
         }
diff -r 0d69c0d6de0d -r 40d7fed4a09e Implab/FuncChainTaskBase.cs
--- a/Implab/FuncChainTaskBase.cs	Fri Apr 22 13:13:08 2016 +0300
+++ b/Implab/FuncChainTaskBase.cs	Mon Aug 29 23:15:51 2016 +0300
@@ -43,10 +43,10 @@
                     p.On(SetResult, HandleErrorInternal, SetCancelledInternal);
                     CancellationRequested(p.Cancel);
                 } catch (Exception err) {
-                    HandleErrorInternal(err);
+                    SetErrorInternal(err);
                 }
             } else {
-                HandleErrorInternal(reason ?? new OperationCanceledException());
+                SetCancelledInternal(reason);
             }
         }
     }
diff -r 0d69c0d6de0d -r 40d7fed4a09e Implab/FuncChainTaskT.cs
--- a/Implab/FuncChainTaskT.cs	Fri Apr 22 13:13:08 2016 +0300
+++ b/Implab/FuncChainTaskT.cs	Mon Aug 29 23:15:51 2016 +0300
@@ -14,10 +14,8 @@
                     var operation = m_task(value);
                     operation.On(SetResult, HandleErrorInternal, SetCancelled);
                     CancellationRequested(operation.Cancel);
-                } catch (OperationCanceledException reason) {
-                    HandleCancelInternal(reason);
                 } catch (Exception err) {
-                    HandleErrorInternal(err);
+                    SetErrorInternal(err);
                 }
             }
         }
diff -r 0d69c0d6de0d -r 40d7fed4a09e Implab/FuncTask.cs
--- a/Implab/FuncTask.cs	Fri Apr 22 13:13:08 2016 +0300
+++ b/Implab/FuncTask.cs	Mon Aug 29 23:15:51 2016 +0300
@@ -13,10 +13,8 @@
             if (m_task != null && LockCancelation()) {
                 try {
                     SetResult(m_task());
-                } catch(OperationCanceledException reason)  {
-                    HandleCancelInternal(reason);
                 } catch(Exception err) {
-                    HandleErrorInternal(err);
+                    SetErrorInternal(err);
                 }
             }
         }
diff -r 0d69c0d6de0d -r 40d7fed4a09e Implab/FuncTaskBase.cs
--- a/Implab/FuncTaskBase.cs	Fri Apr 22 13:13:08 2016 +0300
+++ b/Implab/FuncTaskBase.cs	Mon Aug 29 23:15:51 2016 +0300
@@ -40,10 +40,10 @@
                 try {
                     SetResult(m_cancel(reason));
                 } catch (Exception err) {
-                    HandleErrorInternal(err);
+                    SetErrorInternal(err);
                 }
             } else {
-                HandleErrorInternal(reason ?? new OperationCanceledException());
+                SetCancelledInternal(reason);
             }
         }
 
diff -r 0d69c0d6de0d -r 40d7fed4a09e Implab/FuncTaskT.cs
--- a/Implab/FuncTaskT.cs	Fri Apr 22 13:13:08 2016 +0300
+++ b/Implab/FuncTaskT.cs	Mon Aug 29 23:15:51 2016 +0300
@@ -12,10 +12,8 @@
             if (m_task != null && LockCancelation()) {
                 try {
                     SetResult(m_task(value));
-                } catch(OperationCanceledException reason)  {
-                    HandleCancelInternal(reason);
                 } catch(Exception err) {
-                    HandleErrorInternal(err);
+                    SetErrorInternal(err);
                 }
             }
         }