Don't log ODEs thrown from _abortedCts.Cancel

2015-11-20 00:30:08 +00:00 · 2015-11-20 00:30:08 +00:00 · 174ec739bb
parent 3c7431aa35
commit 174ec739bb
1 changed files with 9 additions and 1 deletions
--- a/src/Microsoft.AspNet.Server.Kestrel/Http/Frame.cs
+++ b/src/Microsoft.AspNet.Server.Kestrel/Http/Frame.cs
@ -199,7 +199,15 @@ namespace Microsoft.AspNet.Server.Kestrel.Http
                ConnectionControl.End(ProduceEndType.SocketDisconnect);
                SocketInput.AbortAwaiting();

-                _abortedCts?.Cancel();
+                try
+                {
+                    _abortedCts?.Cancel();
+                }
+                catch (ObjectDisposedException)
+                {
+                    // Don't log ODEs thrown from _abortedCts.Cancel()
+                    // If _abortedCts is disposed, the app has already completed.
+                }
            }
            catch (Exception ex)
            {