Repository: reef Updated Branches: refs/heads/master 1a2f120c9 -> f2b9b843f
[REEF-1421] Transport Client inner thread is not canceled when the object is disposed This is to cancel the Cancellation token for TransportClient and StreamingTransportClient in Dispose(). JIRA: [REEF-1421](https://issues.apache.org/jira/browse/REEF-1421) This closes #1026 Project: http://git-wip-us.apache.org/repos/asf/reef/repo Commit: http://git-wip-us.apache.org/repos/asf/reef/commit/f2b9b843 Tree: http://git-wip-us.apache.org/repos/asf/reef/tree/f2b9b843 Diff: http://git-wip-us.apache.org/repos/asf/reef/diff/f2b9b843 Branch: refs/heads/master Commit: f2b9b843f6475d243de803a72090e981cca20af8 Parents: 1a2f120 Author: Julia Wang <[email protected]> Authored: Sat Jun 4 12:37:34 2016 -0700 Committer: Andrew Chung <[email protected]> Committed: Mon Jun 6 09:41:46 2016 -0700 ---------------------------------------------------------------------- .../cs/Org.Apache.REEF.Wake/Remote/Impl/StreamingTransportClient.cs | 1 + lang/cs/Org.Apache.REEF.Wake/Remote/Impl/TransportClient.cs | 1 + 2 files changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/reef/blob/f2b9b843/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/StreamingTransportClient.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/StreamingTransportClient.cs b/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/StreamingTransportClient.cs index cabbdd0..0ec4c8a 100644 --- a/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/StreamingTransportClient.cs +++ b/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/StreamingTransportClient.cs @@ -100,6 +100,7 @@ namespace Org.Apache.REEF.Wake.Remote.Impl { if (!_disposed) { + _cancellationSource.Cancel(); _link.Dispose(); _disposed = true; } http://git-wip-us.apache.org/repos/asf/reef/blob/f2b9b843/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/TransportClient.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/TransportClient.cs b/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/TransportClient.cs index 25b9fdc..71fc7ad 100644 --- a/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/TransportClient.cs +++ b/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/TransportClient.cs @@ -112,6 +112,7 @@ namespace Org.Apache.REEF.Wake.Remote.Impl { if (!_disposed && disposing) { + _cancellationSource.Cancel(); _link.Dispose(); _disposed = true; }
