From 4193c92ba78be973fe2734afb47b0d8bfc5b34b6 Mon Sep 17 00:00:00 2001 From: Louis DeJardin Date: Tue, 15 Sep 2015 17:00:58 -0700 Subject: [PATCH] Fixing merge conflicts --- src/Microsoft.AspNet.Server.Kestrel/Http/Connection.cs | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/Microsoft.AspNet.Server.Kestrel/Http/Connection.cs b/src/Microsoft.AspNet.Server.Kestrel/Http/Connection.cs index e9c960c2e5..6a4d9b24d6 100644 --- a/src/Microsoft.AspNet.Server.Kestrel/Http/Connection.cs +++ b/src/Microsoft.AspNet.Server.Kestrel/Http/Connection.cs @@ -125,8 +125,7 @@ namespace Microsoft.AspNet.Server.Kestrel.Http Thread.Post( _this => { - var self = (Connection)state; - var shutdown = new UvShutdownReq(self.Log); + var shutdown = new UvShutdownReq(_this.Log); shutdown.Init(_this.Thread.Loop); shutdown.Shutdown(_this._socket, (req, status, state2) => { @@ -144,10 +143,6 @@ namespace Microsoft.AspNet.Server.Kestrel.Http } Log.ConnectionKeepAlive(_connectionId); - _frame = new Frame(this); - Thread.Post( - state => ((Frame)state).Consume(), - _frame); break; case ProduceEndType.SocketDisconnect: if (_connectionState == ConnectionState.Disconnected)