handle AggregateException it SafeStatus (transaction tests); be more...

handle AggregateException it SafeStatus (transaction tests); be more aggressive about completing the queue in ChannelMessageQueue.Unsubscribe[Async]Impl

StackExchange.Redis.Tests/Transactions.cs

@@ -229,6 +229,12 @@ static TaskStatus SafeStatus(Task task)
                 {
                     if (!task.Wait(1000)) throw new TimeoutException("timeout waiting for task to complete");
                 }
+                catch(AggregateException ex)
+                when (ex.InnerException is TaskCanceledException
+                    || (ex.InnerExceptions.Count == 1 && ex.InnerException is TaskCanceledException))
+                {
+                    return TaskStatus.Canceled;
+                }
                 catch (TaskCanceledException)
                 {
                     return TaskStatus.Canceled;

StackExchange.Redis/StackExchange/Redis/ChannelMessageQueue.cs

@@ -210,22 +210,23 @@ private async void OnMessageAsyncImpl()
         internal void UnsubscribeImpl(Exception error = null, CommandFlags flags = CommandFlags.None)
         {
             var parent = _parent;
+            _parent = null;
             if (parent != null)
             {
                 parent.UnsubscribeAsync(Channel, HandleMessage, flags);
-                _parent = null;
-                _queue.Writer.TryComplete(error);
             }
+            _queue.Writer.TryComplete(error);
+
         }
         internal async Task UnsubscribeAsyncImpl(Exception error = null, CommandFlags flags = CommandFlags.None)
         {
             var parent = _parent;
+            _parent = null;
             if (parent != null)
             {
-                await parent.UnsubscribeAsync(Channel, HandleMessage, flags).ConfigureAwait(false);
-                _parent = null;
-                _queue.Writer.TryComplete(error);
+                await parent.UnsubscribeAsync(Channel, HandleMessage, flags).ConfigureAwait(false);                
             }
+            _queue.Writer.TryComplete(error);
         }
 
         internal static bool IsOneOf(Action<RedisChannel, RedisValue> handler)