From b40d8b4248b6dad39bccc1a8d4aa1e10acbd5b2f Mon Sep 17 00:00:00 2001 From: Stephen Halter Date: Tue, 4 Apr 2017 21:30:33 -0700 Subject: [PATCH] Fix naming of IConnectionInformation.OutputReaderScheduler (#1608) --- .../Internal/ConnectionHandler.cs | 2 +- .../IConnectionInformation.cs | 2 +- .../Internal/LibuvConnectionContext.cs | 2 +- .../Mocks/MockConnectionInformation.cs | 2 +- test/Microsoft.AspNetCore.Server.KestrelTests/FrameTests.cs | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/ConnectionHandler.cs b/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/ConnectionHandler.cs index 1376c975ed..c086397090 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/ConnectionHandler.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/ConnectionHandler.cs @@ -25,7 +25,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal public IConnectionContext OnConnection(IConnectionInformation connectionInfo) { var inputPipe = connectionInfo.PipeFactory.Create(GetInputPipeOptions(connectionInfo.InputWriterScheduler)); - var outputPipe = connectionInfo.PipeFactory.Create(GetOutputPipeOptions(connectionInfo.OutputWriterScheduler)); + var outputPipe = connectionInfo.PipeFactory.Create(GetOutputPipeOptions(connectionInfo.OutputReaderScheduler)); var connectionId = CorrelationIdGenerator.GetNextId(); diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions/IConnectionInformation.cs b/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions/IConnectionInformation.cs index ee02110c0a..f0d4da9085 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions/IConnectionInformation.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions/IConnectionInformation.cs @@ -13,7 +13,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions PipeFactory PipeFactory { get; } IScheduler InputWriterScheduler { get; } - IScheduler OutputWriterScheduler { get; } + IScheduler OutputReaderScheduler { get; } // TODO: Remove timeout management from transport ITimeoutControl TimeoutControl { get; } diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv/Internal/LibuvConnectionContext.cs b/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv/Internal/LibuvConnectionContext.cs index b1a198c8f8..e20796289d 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv/Internal/LibuvConnectionContext.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv/Internal/LibuvConnectionContext.cs @@ -25,7 +25,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Internal public PipeFactory PipeFactory => ListenerContext.Thread.PipelineFactory; public IScheduler InputWriterScheduler => ListenerContext.Thread; - public IScheduler OutputWriterScheduler => ListenerContext.Thread; + public IScheduler OutputReaderScheduler => ListenerContext.Thread; public ITimeoutControl TimeoutControl { get; set; } } diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.Performance/Mocks/MockConnectionInformation.cs b/test/Microsoft.AspNetCore.Server.Kestrel.Performance/Mocks/MockConnectionInformation.cs index 744ab1a601..6429e94220 100644 --- a/test/Microsoft.AspNetCore.Server.Kestrel.Performance/Mocks/MockConnectionInformation.cs +++ b/test/Microsoft.AspNetCore.Server.Kestrel.Performance/Mocks/MockConnectionInformation.cs @@ -14,7 +14,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Performance public PipeFactory PipeFactory { get; } public IScheduler InputWriterScheduler { get; } - public IScheduler OutputWriterScheduler { get; } + public IScheduler OutputReaderScheduler { get; } public ITimeoutControl TimeoutControl { get; } = new MockTimeoutControl(); diff --git a/test/Microsoft.AspNetCore.Server.KestrelTests/FrameTests.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/FrameTests.cs index f4fd2ae784..45949cb5f2 100644 --- a/test/Microsoft.AspNetCore.Server.KestrelTests/FrameTests.cs +++ b/test/Microsoft.AspNetCore.Server.KestrelTests/FrameTests.cs @@ -716,7 +716,7 @@ namespace Microsoft.AspNetCore.Server.KestrelTests public IPEndPoint LocalEndPoint { get; } public PipeFactory PipeFactory { get; } public IScheduler InputWriterScheduler { get; } - public IScheduler OutputWriterScheduler { get; } + public IScheduler OutputReaderScheduler { get; } public ITimeoutControl TimeoutControl { get; set; } = Mock.Of(); } }