From e825da09106b804104cff7d00509ec7f76d00698 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Thu, 25 Jun 2015 17:20:42 -0700 Subject: [PATCH] Fix build --- .../FeatureContext.cs | 10 ++++----- .../RequestProcessing/Response.cs | 22 +++++++++---------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/Microsoft.AspNet.Server.WebListener/FeatureContext.cs b/src/Microsoft.AspNet.Server.WebListener/FeatureContext.cs index e113cc0f34..c4285957cf 100644 --- a/src/Microsoft.AspNet.Server.WebListener/FeatureContext.cs +++ b/src/Microsoft.AspNet.Server.WebListener/FeatureContext.cs @@ -80,7 +80,7 @@ namespace Microsoft.AspNet.Server.WebListener _features = new FeatureCollection(); _authHandler = new AuthenticationHandler(requestContext); _enableResponseCaching = enableResponseCaching; - requestContext.Response.OnResponseStarting(OnStartDelegate, this); + requestContext.Response.OnStarting(OnStartDelegate, this); PopulateFeatures(); } @@ -378,14 +378,14 @@ namespace Microsoft.AspNet.Server.WebListener get { return Response.HasStarted; } } - void IHttpResponseFeature.OnResponseStarting(Func callback, object state) + void IHttpResponseFeature.OnStarting(Func callback, object state) { - Response.OnResponseStarting(callback, state); + Response.OnStarting(callback, state); } - void IHttpResponseFeature.OnResponseCompleted(Func callback, object state) + void IHttpResponseFeature.OnCompleted(Func callback, object state) { - Response.OnResponseCompleted(callback, state); + Response.OnCompleted(callback, state); } string IHttpResponseFeature.ReasonPhrase diff --git a/src/Microsoft.Net.Http.Server/RequestProcessing/Response.cs b/src/Microsoft.Net.Http.Server/RequestProcessing/Response.cs index 65a6442e6e..487aa46cdc 100644 --- a/src/Microsoft.Net.Http.Server/RequestProcessing/Response.cs +++ b/src/Microsoft.Net.Http.Server/RequestProcessing/Response.cs @@ -48,8 +48,8 @@ namespace Microsoft.Net.Http.Server private long _expectedBodyLength; private BoundaryType _boundaryType; private HttpApi.HTTP_RESPONSE_V2 _nativeResponse; - private IList, object>> _onResponseStartingActions; - private IList, object>> _onResponseCompletedActions; + private IList, object>> _onStartingActions; + private IList, object>> _onCompletedActions; private RequestContext _requestContext; private bool _bufferingEnabled; @@ -80,8 +80,8 @@ namespace Microsoft.Net.Http.Server _nativeResponse.Response_V1.Version.MajorVersion = 1; _nativeResponse.Response_V1.Version.MinorVersion = 1; _responseState = ResponseState.Created; - _onResponseStartingActions = new List, object>>(); - _onResponseCompletedActions = new List, object>>(); + _onStartingActions = new List, object>>(); + _onCompletedActions = new List, object>>(); _bufferingEnabled = _requestContext.Server.BufferResponses; _expectedBodyLength = 0; _nativeStream = null; @@ -773,9 +773,9 @@ namespace Microsoft.Net.Http.Server _nativeStream.SwitchToOpaqueMode(); } - public void OnResponseStarting(Func callback, object state) + public void OnStarting(Func callback, object state) { - var actions = _onResponseStartingActions; + var actions = _onStartingActions; if (actions == null) { throw new InvalidOperationException("Response already started"); @@ -784,9 +784,9 @@ namespace Microsoft.Net.Http.Server actions.Add(new Tuple, object>(callback, state)); } - public void OnResponseCompleted(Func callback, object state) + public void OnCompleted(Func callback, object state) { - var actions = _onResponseCompletedActions; + var actions = _onCompletedActions; if (actions == null) { throw new InvalidOperationException("Response already completed"); @@ -797,7 +797,7 @@ namespace Microsoft.Net.Http.Server private void NotifyOnSendingHeaders() { - var actions = Interlocked.Exchange(ref _onResponseStartingActions, null); + var actions = Interlocked.Exchange(ref _onStartingActions, null); if (actions == null) { // Something threw the first time, do not try again. @@ -813,7 +813,7 @@ namespace Microsoft.Net.Http.Server private void NotifyOnResponseCompleted() { - var actions = Interlocked.Exchange(ref _onResponseCompletedActions, null); + var actions = Interlocked.Exchange(ref _onCompletedActions, null); if (actions == null) { // Something threw the first time, do not try again. @@ -829,7 +829,7 @@ namespace Microsoft.Net.Http.Server catch (Exception ex) { RequestContext.Logger.LogWarning( - String.Format(Resources.Warning_ExceptionInOnResponseCompletedAction, nameof(OnResponseCompleted)), + String.Format(Resources.Warning_ExceptionInOnResponseCompletedAction, nameof(OnCompleted)), ex); } }