From d4c7dc3a834edc507865816a59960c5b31f9b10c Mon Sep 17 00:00:00 2001
From: Ryan Nowak <nowakra@gmail.com>
Date: Thu, 7 Apr 2016 09:25:32 -0700
Subject: [PATCH] Make HashSets in TempData lazy

TempData is frequently created but not modified, this reduces the cost of
that without much complexity.
---
 .../ViewFeatures/TempDataDictionary.cs                    | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/TempDataDictionary.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/TempDataDictionary.cs
index 37b201a25b..38ea9bae88 100644
--- a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/TempDataDictionary.cs
+++ b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/TempDataDictionary.cs
@@ -11,12 +11,14 @@ namespace Microsoft.AspNetCore.Mvc.ViewFeatures
     /// <inheritdoc />
     public class TempDataDictionary : ITempDataDictionary
     {
+        // Perf: Everything here is lazy because the TempDataDictionary is frequently created and passed around
+        // without being manipulated.
         private Dictionary<string, object> _data;
         private bool _loaded;
         private readonly ITempDataProvider _provider;
         private readonly HttpContext _context;
-        private HashSet<string> _initialKeys = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
-        private HashSet<string> _retainedKeys = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+        private HashSet<string> _initialKeys;
+        private HashSet<string> _retainedKeys;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="TempDataDictionary"/> class.
@@ -132,7 +134,7 @@ namespace Microsoft.AspNetCore.Mvc.ViewFeatures
                 ? new Dictionary<string, object>(providerDictionary, StringComparer.OrdinalIgnoreCase)
                 : new Dictionary<string, object>(StringComparer.OrdinalIgnoreCase);
             _initialKeys = new HashSet<string>(_data.Keys, StringComparer.OrdinalIgnoreCase);
-            _retainedKeys.Clear();
+            _retainedKeys = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
             _loaded = true;
         }