revert ordering change to address PR feedback (#45964)

adamsitnik · web-flow · commit 3f238740d6c8 · 2021-01-16T10:13:30.000-06:00
diff --git a/src/libraries/Microsoft.Extensions.Caching.Memory/src/CacheEntry.cs b/src/libraries/Microsoft.Extensions.Caching.Memory/src/CacheEntry.cs
@@ -136,6 +136,8 @@ public void Dispose()
             {
                 _state.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.
@@ -149,7 +151,6 @@ public void Dispose()
                     }
                 }
 
-                CacheEntryHelper.ExitScope(this, _previous);
                 _previous = null; // we don't want to root unnecessary objects
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -136,6 +136,8 @@ public void Dispose()`
`136`	`136`	`{`
`137`	`137`	`_state.IsDisposed = true;`
`138`	`138`
	`139`	`+ CacheEntryHelper.ExitScope(this, _previous);`
	`140`	`+`
`139`	`141`	`// Don't commit or propagate options if the CacheEntry Value was never set.`
`140`	`142`	`// We assume an exception occurred causing the caller to not set the Value successfully,`
`141`	`143`	`// so don't use this entry.`
`@@ -149,7 +151,6 @@ public void Dispose()`
`149`	`151`	`}`
`150`	`152`	`}`
`151`	`153`
`152`		`- CacheEntryHelper.ExitScope(this, _previous);`
`153`	`154`	`_previous = null; // we don't want to root unnecessary objects`
`154`	`155`	`}`
`155`	`156`	`}`