BugFix - fixed OperationCanceledException in OutputHandlerTest

Author: Martin Lercher

src/JsonRpc/OutputHandler.cs

@@ -19,7 +19,8 @@ public OutputHandler(TextWriter output)
             _output = output;
             _queue = new BlockingCollection<object>();
             _cancel = new CancellationTokenSource();
-            _thread = new Thread(ProcessOutputQueue) {
+            _thread = new Thread(ProcessOutputQueue)
+            {
                 IsBackground = true
             };
         }
@@ -37,11 +38,11 @@ public void Send(object value)
         private void ProcessOutputQueue()
         {
             var token = _cancel.Token;
-            while (true)
+            try
             {
-                if (_thread == null) return;
-                try
+                while (true)
                 {
+                    if (_thread == null) return;
                     if (_queue.TryTake(out var value, Timeout.Infinite, token))
                     {
                         var content = JsonConvert.SerializeObject(value);
@@ -55,8 +56,14 @@ private void ProcessOutputQueue()
                         _output.Write(sb.ToString());
                     }
                 }
-                catch (OperationCanceledException) { }
             }
+            catch (OperationCanceledException ex)
+            {
+                if (ex.CancellationToken != token)
+                    throw;
+                // else ignore. Exceptions: OperationCanceledException - The CancellationToken has been canceled.
+            }
+            finally { _cancel.Dispose(); }
         }
 
         public void Dispose()