From 8559bff303b03526b4f5c0e4d618478a58c2bd9a Mon Sep 17 00:00:00 2001 From: Adam Sitnik Date: Fri, 11 Dec 2020 15:43:56 +0100 Subject: [PATCH] revert ordering change to address PR feedback --- .../Microsoft.Extensions.Caching.Memory/src/CacheEntry.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/libraries/Microsoft.Extensions.Caching.Memory/src/CacheEntry.cs b/src/libraries/Microsoft.Extensions.Caching.Memory/src/CacheEntry.cs index 6f91cb21f038cd..e3cd7394046c0b 100644 --- a/src/libraries/Microsoft.Extensions.Caching.Memory/src/CacheEntry.cs +++ b/src/libraries/Microsoft.Extensions.Caching.Memory/src/CacheEntry.cs @@ -145,6 +145,8 @@ public void Dispose() { IsDisposed = true; + CacheEntryHelper.ExitScope(this, _previous); + // Don't commit or propagate options if the CacheEntry Value was never set. // We assume an exception occurred causing the caller to not set the Value successfully, // so don't use this entry. @@ -158,7 +160,6 @@ public void Dispose() } } - CacheEntryHelper.ExitScope(this, _previous); _previous = null; // we don't want to root unnecessary objects } }