Revert Feature changes

benaadams · benaadams · commit a56385321c25 · 2015-12-08T17:17:34.000Z
diff --git a/src/Microsoft.AspNet.Http/Features/QueryFeature.cs b/src/Microsoft.AspNet.Http/Features/QueryFeature.cs
@@ -9,7 +9,7 @@ namespace Microsoft.AspNet.Http.Features.Internal
 {
     public class QueryFeature : IQueryFeature, IFeatureCache
     {
-        private IFeatureCollection _features;
+        private readonly IFeatureCollection _features;
         private int _cachedFeaturesRevision = -1;
 
         private IHttpRequestFeature _request;
@@ -41,17 +41,11 @@ void IFeatureCache.CheckFeaturesRevision()
         {
             if (_cachedFeaturesRevision != _features.Revision)
             {
-                ResetFeatures();
+                _request = null;
+                _cachedFeaturesRevision = _features.Revision;
             }
         }
 
-        private void ResetFeatures()
-        {
-            _request = null;
-            _parsedValues = null;
-            _cachedFeaturesRevision = _features.Revision;
-        }
-
         private IHttpRequestFeature HttpRequestFeature
         {
             get { return FeatureHelpers.GetAndCache(this, _features, ref _request); }
diff --git a/src/Microsoft.AspNet.Http/Features/RequestCookiesFeature.cs b/src/Microsoft.AspNet.Http/Features/RequestCookiesFeature.cs
@@ -11,7 +11,7 @@ namespace Microsoft.AspNet.Http.Features.Internal
 {
     public class RequestCookiesFeature : IRequestCookiesFeature, IFeatureCache
     {
-        private IFeatureCollection _features;
+        private readonly IFeatureCollection _features;
         private int _cachedFeaturesRevision = -1;
 
         private IHttpRequestFeature _request;
@@ -43,17 +43,11 @@ void IFeatureCache.CheckFeaturesRevision()
         {
             if (_cachedFeaturesRevision != _features.Revision)
             {
-                ResetFeatures();
+                _request = null;
+                _cachedFeaturesRevision = _features.Revision;
             }
         }
 
-        private void ResetFeatures()
-        {
-            _request = null;
-            _parsedValues = null;
-            _cachedFeaturesRevision = _features.Revision;
-        }
-
         private IHttpRequestFeature HttpRequestFeature
         {
             get { return FeatureHelpers.GetAndCache(this, _features, ref _request); }
diff --git a/src/Microsoft.AspNet.Http/Features/ResponseCookiesFeature.cs b/src/Microsoft.AspNet.Http/Features/ResponseCookiesFeature.cs
@@ -7,7 +7,7 @@ namespace Microsoft.AspNet.Http.Features.Internal
 {
     public class ResponseCookiesFeature : IResponseCookiesFeature, IFeatureCache
     {
-        private IFeatureCollection _features;
+        private readonly IFeatureCollection _features;
         private int _cachedFeaturesRevision = -1;
 
         private IHttpResponseFeature _response;
@@ -22,17 +22,11 @@ void IFeatureCache.CheckFeaturesRevision()
         {
             if (_cachedFeaturesRevision != _features.Revision)
             {
-                ResetFeatures();
+                _response = null;
+                _cachedFeaturesRevision = _features.Revision;
             }
         }
 
-        private void ResetFeatures()
-        {
-            _response = null;
-            _cookiesCollection = null;
-            _cachedFeaturesRevision = _features.Revision;
-        }
-
         private IHttpResponseFeature HttpResponseFeature
         {
             get { return FeatureHelpers.GetAndCache(this, _features, ref _response); }

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ namespace Microsoft.AspNet.Http.Features.Internal`
`9`	`9`	`{`
`10`	`10`	`public class QueryFeature : IQueryFeature, IFeatureCache`
`11`	`11`	`{`
`12`		`- private IFeatureCollection _features;`
	`12`	`+ private readonly IFeatureCollection _features;`
`13`	`13`	`private int _cachedFeaturesRevision = -1;`
`14`	`14`
`15`	`15`	`private IHttpRequestFeature _request;`
`@@ -41,17 +41,11 @@ void IFeatureCache.CheckFeaturesRevision()`
`41`	`41`	`{`
`42`	`42`	`if (_cachedFeaturesRevision != _features.Revision)`
`43`	`43`	`{`
`44`		`- ResetFeatures();`
	`44`	`+ _request = null;`
	`45`	`+ _cachedFeaturesRevision = _features.Revision;`
`45`	`46`	`}`
`46`	`47`	`}`
`47`	`48`
`48`		`- private void ResetFeatures()`
`49`		`- {`
`50`		`- _request = null;`
`51`		`- _parsedValues = null;`
`52`		`- _cachedFeaturesRevision = _features.Revision;`
`53`		`- }`
`54`		`-`
`55`	`49`	`private IHttpRequestFeature HttpRequestFeature`
`56`	`50`	`{`
`57`	`51`	`get { return FeatureHelpers.GetAndCache(this, _features, ref _request); }`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ namespace Microsoft.AspNet.Http.Features.Internal`
`11`	`11`	`{`
`12`	`12`	`public class RequestCookiesFeature : IRequestCookiesFeature, IFeatureCache`
`13`	`13`	`{`
`14`		`- private IFeatureCollection _features;`
	`14`	`+ private readonly IFeatureCollection _features;`
`15`	`15`	`private int _cachedFeaturesRevision = -1;`
`16`	`16`
`17`	`17`	`private IHttpRequestFeature _request;`
`@@ -43,17 +43,11 @@ void IFeatureCache.CheckFeaturesRevision()`
`43`	`43`	`{`
`44`	`44`	`if (_cachedFeaturesRevision != _features.Revision)`
`45`	`45`	`{`
`46`		`- ResetFeatures();`
	`46`	`+ _request = null;`
	`47`	`+ _cachedFeaturesRevision = _features.Revision;`
`47`	`48`	`}`
`48`	`49`	`}`
`49`	`50`
`50`		`- private void ResetFeatures()`
`51`		`- {`
`52`		`- _request = null;`
`53`		`- _parsedValues = null;`
`54`		`- _cachedFeaturesRevision = _features.Revision;`
`55`		`- }`
`56`		`-`
`57`	`51`	`private IHttpRequestFeature HttpRequestFeature`
`58`	`52`	`{`
`59`	`53`	`get { return FeatureHelpers.GetAndCache(this, _features, ref _request); }`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ namespace Microsoft.AspNet.Http.Features.Internal`
`7`	`7`	`{`
`8`	`8`	`public class ResponseCookiesFeature : IResponseCookiesFeature, IFeatureCache`
`9`	`9`	`{`
`10`		`- private IFeatureCollection _features;`
	`10`	`+ private readonly IFeatureCollection _features;`
`11`	`11`	`private int _cachedFeaturesRevision = -1;`
`12`	`12`
`13`	`13`	`private IHttpResponseFeature _response;`
`@@ -22,17 +22,11 @@ void IFeatureCache.CheckFeaturesRevision()`
`22`	`22`	`{`
`23`	`23`	`if (_cachedFeaturesRevision != _features.Revision)`
`24`	`24`	`{`
`25`		`- ResetFeatures();`
	`25`	`+ _response = null;`
	`26`	`+ _cachedFeaturesRevision = _features.Revision;`
`26`	`27`	`}`
`27`	`28`	`}`
`28`	`29`
`29`		`- private void ResetFeatures()`
`30`		`- {`
`31`		`- _response = null;`
`32`		`- _cookiesCollection = null;`
`33`		`- _cachedFeaturesRevision = _features.Revision;`
`34`		`- }`
`35`		`-`
`36`	`30`	`private IHttpResponseFeature HttpResponseFeature`
`37`	`31`	`{`
`38`	`32`	`get { return FeatureHelpers.GetAndCache(this, _features, ref _response); }`