Mercurial > pub > ImplabNet
diff Implab/ActionChainTaskBase.cs @ 199:43b1017ce100 v2
Слияние с default
author | cin |
---|---|
date | Fri, 14 Oct 2016 03:33:17 +0300 |
parents | b305c678923a |
children |
line wrap: on
line diff
--- a/Implab/ActionChainTaskBase.cs Wed May 04 12:28:08 2016 +0300 +++ b/Implab/ActionChainTaskBase.cs Fri Oct 14 03:33:17 2016 +0300 @@ -36,10 +36,10 @@ // отдавать ли результат или подтвердить отмену (или вернуть ошибку). CancellationRequested(p.Cancel); } catch (Exception err) { - HandleErrorInternal(err); + SetErrorInternal(err); } } else { - HandleErrorInternal(reason ?? new OperationCanceledException()); + SetCancelledInternal(reason); } } @@ -50,7 +50,7 @@ p.On(SetResult, SetErrorInternal, SetCancelledInternal); CancellationRequested(p.Cancel); } catch (Exception err) { - SetErrorInternal(error); + SetErrorInternal(err); } } else { SetErrorInternal(error);