From 13defc5a32a4062d54f2a47afb723b3ae1c06811 Mon Sep 17 00:00:00 2001 From: Louis DeJardin Date: Fri, 18 Sep 2015 22:31:05 -0700 Subject: [PATCH] Initialize Memory2 in ListenerContext Better than initializing from multiple other classes --- src/Microsoft.AspNet.Server.Kestrel/Http/Listener.cs | 1 - src/Microsoft.AspNet.Server.Kestrel/Http/ListenerContext.cs | 2 ++ src/Microsoft.AspNet.Server.Kestrel/Http/ListenerSecondary.cs | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Microsoft.AspNet.Server.Kestrel/Http/Listener.cs b/src/Microsoft.AspNet.Server.Kestrel/Http/Listener.cs index a828d4d17a..741180aee3 100644 --- a/src/Microsoft.AspNet.Server.Kestrel/Http/Listener.cs +++ b/src/Microsoft.AspNet.Server.Kestrel/Http/Listener.cs @@ -16,7 +16,6 @@ namespace Microsoft.AspNet.Server.Kestrel.Http protected Listener(ServiceContext serviceContext) : base(serviceContext) { - Memory2 = new MemoryPool2(); } protected UvStreamHandle ListenSocket { get; private set; } diff --git a/src/Microsoft.AspNet.Server.Kestrel/Http/ListenerContext.cs b/src/Microsoft.AspNet.Server.Kestrel/Http/ListenerContext.cs index 03d27501d6..2f6201016b 100644 --- a/src/Microsoft.AspNet.Server.Kestrel/Http/ListenerContext.cs +++ b/src/Microsoft.AspNet.Server.Kestrel/Http/ListenerContext.cs @@ -11,11 +11,13 @@ namespace Microsoft.AspNet.Server.Kestrel.Http { public ListenerContext() { + Memory2 = new MemoryPool2(); } public ListenerContext(ServiceContext serviceContext) : base(serviceContext) { + Memory2 = new MemoryPool2(); } public ListenerContext(ListenerContext listenerContext) diff --git a/src/Microsoft.AspNet.Server.Kestrel/Http/ListenerSecondary.cs b/src/Microsoft.AspNet.Server.Kestrel/Http/ListenerSecondary.cs index 2d4df89d52..e50a69071c 100644 --- a/src/Microsoft.AspNet.Server.Kestrel/Http/ListenerSecondary.cs +++ b/src/Microsoft.AspNet.Server.Kestrel/Http/ListenerSecondary.cs @@ -18,7 +18,6 @@ namespace Microsoft.AspNet.Server.Kestrel.Http { protected ListenerSecondary(ServiceContext serviceContext) : base(serviceContext) { - Memory2 = new MemoryPool2(); } UvPipeHandle DispatchPipe { get; set; }