From 498d2099498fe9e62b73c4aca2ec039fe803e8fb Mon Sep 17 00:00:00 2001 From: Pranav K Date: Mon, 21 Sep 2015 16:12:03 -0700 Subject: [PATCH] Remove chaining from HashCodeCombiner. Reacting to https://github.com/aspnet/Common/issues/40 --- .../ModelBinding/ModelBindingResult.cs | 11 ++++++----- .../Precompilation/RazorPreCompileModule.cs | 9 +++++---- .../ViewLocationCacheResult.cs | 5 ++--- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/Microsoft.AspNet.Mvc.Abstractions/ModelBinding/ModelBindingResult.cs b/src/Microsoft.AspNet.Mvc.Abstractions/ModelBinding/ModelBindingResult.cs index 2233828c52..1246946199 100644 --- a/src/Microsoft.AspNet.Mvc.Abstractions/ModelBinding/ModelBindingResult.cs +++ b/src/Microsoft.AspNet.Mvc.Abstractions/ModelBinding/ModelBindingResult.cs @@ -131,11 +131,12 @@ namespace Microsoft.AspNet.Mvc.ModelBinding /// public override int GetHashCode() { - var hash = HashCodeCombiner.Start(); - hash.Add(Key, StringComparer.OrdinalIgnoreCase); - hash.Add(IsModelSet); - hash.Add(Model); - return hash.CombinedHash; + var hashCodeCombiner = HashCodeCombiner.Start(); + hashCodeCombiner.Add(Key, StringComparer.OrdinalIgnoreCase); + hashCodeCombiner.Add(IsModelSet); + hashCodeCombiner.Add(Model); + + return hashCodeCombiner.CombinedHash; } /// diff --git a/src/Microsoft.AspNet.Mvc.Razor/Precompilation/RazorPreCompileModule.cs b/src/Microsoft.AspNet.Mvc.Razor/Precompilation/RazorPreCompileModule.cs index 6a4cdad8f7..ee8b1d9e8a 100644 --- a/src/Microsoft.AspNet.Mvc.Razor/Precompilation/RazorPreCompileModule.cs +++ b/src/Microsoft.AspNet.Mvc.Razor/Precompilation/RazorPreCompileModule.cs @@ -82,10 +82,11 @@ namespace Microsoft.AspNet.Mvc.Razor.Precompilation public override int GetHashCode() { - return HashCodeCombiner - .Start() - .Add(Configuration) - .Add(TargetFramework); + var hashCodeCombiner = HashCodeCombiner.Start(); + hashCodeCombiner.Add(Configuration); + hashCodeCombiner.Add(TargetFramework); + + return hashCodeCombiner; } } } diff --git a/src/Microsoft.AspNet.Mvc.Razor/ViewLocationCacheResult.cs b/src/Microsoft.AspNet.Mvc.Razor/ViewLocationCacheResult.cs index 0e05ab37ae..0ada426a55 100644 --- a/src/Microsoft.AspNet.Mvc.Razor/ViewLocationCacheResult.cs +++ b/src/Microsoft.AspNet.Mvc.Razor/ViewLocationCacheResult.cs @@ -109,9 +109,8 @@ namespace Microsoft.AspNet.Mvc.Razor /// public override int GetHashCode() { - var hashCodeCombiner = HashCodeCombiner.Start() - .Add(IsFoundResult); - + var hashCodeCombiner = HashCodeCombiner.Start(); + hashCodeCombiner.Add(IsFoundResult); if (IsFoundResult) {