From 2b2943d5b0756ab8662676e42a97d7cfea965318 Mon Sep 17 00:00:00 2001
From: Ivan Derevyanko <drussilla7@gmail.com>
Date: Wed, 9 Sep 2015 01:27:44 +0200
Subject: [PATCH] Restore static delegates

---
 .../Networking/UvConnectRequest.cs            |  7 +++----
 .../Networking/UvStreamHandle.cs              | 21 ++++++++-----------
 .../Networking/UvWriteReq.cs                  |  7 +++----
 3 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/src/Microsoft.AspNet.Server.Kestrel/Networking/UvConnectRequest.cs b/src/Microsoft.AspNet.Server.Kestrel/Networking/UvConnectRequest.cs
index 59df2af68a..bbc94bc2dc 100644
--- a/src/Microsoft.AspNet.Server.Kestrel/Networking/UvConnectRequest.cs
+++ b/src/Microsoft.AspNet.Server.Kestrel/Networking/UvConnectRequest.cs
@@ -12,14 +12,13 @@ namespace Microsoft.AspNet.Server.Kestrel.Networking
     /// </summary>
     public class UvConnectRequest : UvRequest
     {
-        private readonly Libuv.uv_connect_cb _uv_connect_cb;
+        private readonly static Libuv.uv_connect_cb _uv_connect_cb = UvConnectCb;
 
         private Action<UvConnectRequest, int, Exception, object> _callback;
         private object _state;
 
         public UvConnectRequest(IKestrelTrace logger) : base (logger)
         {
-            _uv_connect_cb = UvConnectCb;
         }
 
         public void Init(UvLoopHandle loop)
@@ -44,7 +43,7 @@ namespace Microsoft.AspNet.Server.Kestrel.Networking
             Libuv.pipe_connect(this, pipe, name, _uv_connect_cb);
         }
 
-        private void UvConnectCb(IntPtr ptr, int status)
+        private  static void UvConnectCb(IntPtr ptr, int status)
         {
             var req = FromIntPtr<UvConnectRequest>(ptr);
             req.Unpin();
@@ -67,7 +66,7 @@ namespace Microsoft.AspNet.Server.Kestrel.Networking
             }
             catch (Exception ex)
             {
-                _log.LogError("UvConnectRequest", ex);
+                req._log.LogError("UvConnectRequest", ex);
             }
         }
     }
diff --git a/src/Microsoft.AspNet.Server.Kestrel/Networking/UvStreamHandle.cs b/src/Microsoft.AspNet.Server.Kestrel/Networking/UvStreamHandle.cs
index 4bc2712655..c215ae67e6 100644
--- a/src/Microsoft.AspNet.Server.Kestrel/Networking/UvStreamHandle.cs
+++ b/src/Microsoft.AspNet.Server.Kestrel/Networking/UvStreamHandle.cs
@@ -10,9 +10,9 @@ namespace Microsoft.AspNet.Server.Kestrel.Networking
 {
     public abstract class UvStreamHandle : UvHandle
     {
-        private readonly Libuv.uv_connection_cb _uv_connection_cb;
-        private readonly Libuv.uv_alloc_cb _uv_alloc_cb;
-        private readonly Libuv.uv_read_cb _uv_read_cb;
+        private readonly static Libuv.uv_connection_cb _uv_connection_cb = UvConnectionCb;
+        private readonly static Libuv.uv_alloc_cb _uv_alloc_cb = UvAllocCb;
+        private readonly static Libuv.uv_read_cb _uv_read_cb = UvReadCb;
 
         public Action<UvStreamHandle, int, Exception, object> _listenCallback;
         public object _listenState;
@@ -25,9 +25,6 @@ namespace Microsoft.AspNet.Server.Kestrel.Networking
 
         protected UvStreamHandle(IKestrelTrace logger) : base(logger)
         {
-            _uv_connection_cb = UvConnectionCb;
-            _uv_alloc_cb = UvAllocCb;
-            _uv_read_cb = UvReadCb;
         }
 
         protected override bool ReleaseHandle()
@@ -122,7 +119,7 @@ namespace Microsoft.AspNet.Server.Kestrel.Networking
         }
 
 
-        private void UvConnectionCb(IntPtr handle, int status)
+        private static void UvConnectionCb(IntPtr handle, int status)
         {
             var stream = FromIntPtr<UvStreamHandle>(handle);
 
@@ -135,12 +132,12 @@ namespace Microsoft.AspNet.Server.Kestrel.Networking
             }
             catch (Exception ex)
             {
-                _log.LogError("UvConnectionCb", ex);
+                stream._log.LogError("UvConnectionCb", ex);
             }
         }
 
 
-        private void UvAllocCb(IntPtr handle, int suggested_size, out Libuv.uv_buf_t buf)
+        private static void UvAllocCb(IntPtr handle, int suggested_size, out Libuv.uv_buf_t buf)
         {
             var stream = FromIntPtr<UvStreamHandle>(handle);
             try
@@ -149,13 +146,13 @@ namespace Microsoft.AspNet.Server.Kestrel.Networking
             }
             catch (Exception ex)
             {
-                _log.LogError("UvAllocCb", ex);
+                stream._log.LogError("UvAllocCb", ex);
                 buf = stream.Libuv.buf_init(IntPtr.Zero, 0);
                 throw;
             }
         }
 
-        private void UvReadCb(IntPtr handle, int nread, ref Libuv.uv_buf_t buf)
+        private static void UvReadCb(IntPtr handle, int nread, ref Libuv.uv_buf_t buf)
         {
             var stream = FromIntPtr<UvStreamHandle>(handle);
 
@@ -174,7 +171,7 @@ namespace Microsoft.AspNet.Server.Kestrel.Networking
             }
             catch (Exception ex)
             {
-                _log.LogError("UbReadCb", ex);
+                stream._log.LogError("UbReadCb", ex);
             }
         }
 
diff --git a/src/Microsoft.AspNet.Server.Kestrel/Networking/UvWriteReq.cs b/src/Microsoft.AspNet.Server.Kestrel/Networking/UvWriteReq.cs
index feadb2de49..298bdf416f 100644
--- a/src/Microsoft.AspNet.Server.Kestrel/Networking/UvWriteReq.cs
+++ b/src/Microsoft.AspNet.Server.Kestrel/Networking/UvWriteReq.cs
@@ -14,7 +14,7 @@ namespace Microsoft.AspNet.Server.Kestrel.Networking
     /// </summary>
     public class UvWriteReq : UvRequest
     {
-        private readonly Libuv.uv_write_cb _uv_write_cb;
+        private readonly static Libuv.uv_write_cb _uv_write_cb = UvWriteCb;
 
         private IntPtr _bufs;
 
@@ -26,7 +26,6 @@ namespace Microsoft.AspNet.Server.Kestrel.Networking
 
         public UvWriteReq(IKestrelTrace logger) : base(logger)
         {
-            _uv_write_cb = UvWriteCb;
         }
 
         public void Init(UvLoopHandle loop)
@@ -144,7 +143,7 @@ namespace Microsoft.AspNet.Server.Kestrel.Networking
             req._pins.Clear();
         }
 
-        private void UvWriteCb(IntPtr ptr, int status)
+        private static void UvWriteCb(IntPtr ptr, int status)
         {
             var req = FromIntPtr<UvWriteReq>(ptr);
             Unpin(req);
@@ -167,7 +166,7 @@ namespace Microsoft.AspNet.Server.Kestrel.Networking
             }
             catch (Exception ex)
             {
-                _log.LogError("UvWriteCb", ex);
+                req._log.LogError("UvWriteCb", ex);
             }
         }
     }