From 40bef1bc780c457bccee2b83c8b2d2d2f13f3971 Mon Sep 17 00:00:00 2001 From: Hu Weiwen Date: Thu, 15 Jun 2017 13:45:32 +0800 Subject: [PATCH] Simplify delegate invoking (#565) --- .../HttpConnection.cs | 21 +++---------------- 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/src/Microsoft.AspNetCore.Sockets.Client.Http/HttpConnection.cs b/src/Microsoft.AspNetCore.Sockets.Client.Http/HttpConnection.cs index 412ba30f9f..0a5c101b9c 100644 --- a/src/Microsoft.AspNetCore.Sockets.Client.Http/HttpConnection.cs +++ b/src/Microsoft.AspNetCore.Sockets.Client.Http/HttpConnection.cs @@ -140,12 +140,7 @@ namespace Microsoft.AspNetCore.Sockets.Client { _logger.LogDebug("Raising Connected event"); - // Do not "simplify" - events can be removed from a different thread - var connectedEventHandler = Connected; - if (connectedEventHandler != null) - { - connectedEventHandler(); - } + Connected?.Invoke(); return Task.CompletedTask; }); @@ -171,12 +166,7 @@ namespace Microsoft.AspNetCore.Sockets.Client _logger.LogDebug("Raising Closed event"); - // Do not "simplify" - event handlers can be removed from a different thread - var closedEventHandler = Closed; - if (closedEventHandler != null) - { - closedEventHandler(t.IsFaulted ? t.Exception.InnerException : null); - } + Closed?.Invoke(t.IsFaulted ? t.Exception.InnerException : null); return Task.CompletedTask; }); @@ -299,12 +289,7 @@ namespace Microsoft.AspNetCore.Sockets.Client { _logger.LogDebug("Raising Received event."); - // Do not "simplify" - event handlers can be removed from a different thread - var receivedEventHandler = Received; - if (receivedEventHandler != null) - { - receivedEventHandler(buffer); - } + Received?.Invoke(buffer); return Task.CompletedTask; });