Check the length before ToArray()

JunTaoLuo · JunTaoLuo · commit 20e11e47ed08 · 2016-09-01T10:28:31.000-07:00
diff --git a/src/Microsoft.AspNetCore.ResponseCaching/ResponseCachingContext.cs b/src/Microsoft.AspNetCore.ResponseCaching/ResponseCachingContext.cs
@@ -594,16 +594,12 @@ internal void FinalizeCachingHeaders()
 
         internal void FinalizeCachingBody()
         {
-            if (CacheResponse && ResponseCacheStream.BufferingEnabled)
+            if (CacheResponse &&
+                ResponseCacheStream.BufferingEnabled &&
+                !(_options.MaximumCachedBodySize < ResponseCacheStream.BufferedStream.Length))
             {
                 _cachedResponse.Body = ResponseCacheStream.BufferedStream.ToArray();
 
-                // Check if the body is too large to be cached
-                if (_options.MaximumCachedBodySize < _cachedResponse.Body.Length)
-                {
-                    return;
-                }
-
                 _cache.Set(_cacheKey, _cachedResponse, _cachedResponseValidFor);
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -594,16 +594,12 @@ internal void FinalizeCachingHeaders()`
`594`	`594`
`595`	`595`	`internal void FinalizeCachingBody()`
`596`	`596`	`{`
`597`		`- if (CacheResponse && ResponseCacheStream.BufferingEnabled)`
	`597`	`+ if (CacheResponse &&`
	`598`	`+ ResponseCacheStream.BufferingEnabled &&`
	`599`	`+ !(_options.MaximumCachedBodySize < ResponseCacheStream.BufferedStream.Length))`
`598`	`600`	`{`
`599`	`601`	`_cachedResponse.Body = ResponseCacheStream.BufferedStream.ToArray();`
`600`	`602`
`601`		`- // Check if the body is too large to be cached`
`602`		`- if (_options.MaximumCachedBodySize < _cachedResponse.Body.Length)`
`603`		`- {`
`604`		`- return;`
`605`		`- }`
`606`		`-`
`607`	`603`	`_cache.Set(_cacheKey, _cachedResponse, _cachedResponseValidFor);`
`608`	`604`	`}`
`609`	`605`	`}`