Rebasing and fixing code to be uniform.

Author: stebet

projects/RabbitMQ.Client/client/events/AsyncEventingBasicConsumer.cs

@@ -45,14 +45,10 @@ public override async Task HandleBasicConsumeOk(string consumerTag)
         }
 
         ///<summary>Fires the Received event.</summary>
-        public override Task HandleBasicDeliver(string consumerTag, ulong deliveryTag, bool redelivered, string exchange, string routingKey, IBasicProperties properties, ReadOnlyMemory<byte> body)
+        public override async Task HandleBasicDeliver(string consumerTag, ulong deliveryTag, bool redelivered, string exchange, string routingKey, IBasicProperties properties, ReadOnlyMemory<byte> body)
         {
-            if (Received != null)
-            {
-                return Received.Invoke(this, new BasicDeliverEventArgs(consumerTag, deliveryTag, redelivered, exchange, routingKey, properties, body));
-            }
-
-            return Task.CompletedTask;
+            await base.HandleBasicDeliver(consumerTag, deliveryTag, redelivered, exchange, routingKey, properties, body);
+            await (Received?.Invoke(this, new BasicDeliverEventArgs(consumerTag, deliveryTag, redelivered, exchange, routingKey, properties, body)) ?? Task.CompletedTask).ConfigureAwait(false);
         }
 
         ///<summary>Fires the Shutdown event.</summary>