Revert "Lock timeout optimization"

This reverts commit 495106f.
ZiggyCreatures · Jan 16, 2022 · 5716a32 · 5716a32
1 parent 495106f
commit 5716a32
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 47 deletions.
diff --git a/src/ZiggyCreatures.FusionCache/FusionCache_Async.cs b/src/ZiggyCreatures.FusionCache/FusionCache_Async.cs
@@ -65,30 +65,7 @@ public partial class FusionCache
 			IFusionCacheEntry? entry;
 
 			// LOCK
-			var lto = options.LockTimeout;
-			if (lto == Timeout.InfiniteTimeSpan && memoryEntry is object && options.IsFailSafeEnabled && options.FactorySoftTimeout != Timeout.InfiniteTimeSpan)
-			{
-				// IF THERE IS NO SPECIFIC LOCK TIMEOUT
-				// + THERE IS A FALLBACK ENTRY
-				// + FAILSAFE IS ENABLED
-				// + THERE IS A FACTORY SOFT TIMEOUT
-				// --> USE IT AS A LOCK TIMEOUT
-				lto = options.FactorySoftTimeout;
-			}
-			var lockObj = await _reactor.AcquireLockAsync(key, operationId, lto, _logger, token).ConfigureAwait(false);
-
-			if (lockObj is null && memoryEntry is object)
-			{
-				// IF THE LOCK HAS NOT BEEN ACQUIRED
-				// + THERE IS A FALLBACK ENTRY
-				// --> USE IT (WITHOUT SAVING IT, SINCE THE ALREADY RUNNING FACTORY WILL DO IT ANYWAY)
-
-				// EVENT
-				_events.OnHit(operationId, key, memoryEntryIsValid == false);
-
-				return memoryEntry;
-			}
-
+			var lockObj = await _reactor.AcquireLockAsync(key, operationId, options.LockTimeout, _logger, token).ConfigureAwait(false);
 			bool isStale;
 			bool factoryCompletedSuccessfully = false;
 

diff --git a/src/ZiggyCreatures.FusionCache/FusionCache_Sync.cs b/src/ZiggyCreatures.FusionCache/FusionCache_Sync.cs
@@ -65,30 +65,7 @@ public partial class FusionCache
 			IFusionCacheEntry? entry;
 
 			// LOCK
-			var lto = options.LockTimeout;
-			if (lto == Timeout.InfiniteTimeSpan && memoryEntry is object && options.IsFailSafeEnabled && options.FactorySoftTimeout != Timeout.InfiniteTimeSpan)
-			{
-				// IF THERE IS NO SPECIFIC LOCK TIMEOUT
-				// + THERE IS A FALLBACK ENTRY
-				// + FAILSAFE IS ENABLED
-				// + THERE IS A FACTORY SOFT TIMEOUT
-				// --> USE IT AS A LOCK TIMEOUT
-				lto = options.FactorySoftTimeout;
-			}
 			var lockObj = _reactor.AcquireLock(key, operationId, options.LockTimeout, _logger);
-
-			if (lockObj is null && memoryEntry is object)
-			{
-				// IF THE LOCK HAS NOT BEEN ACQUIRED
-				// + THERE IS A FALLBACK ENTRY
-				// --> USE IT (WITHOUT SAVING IT, SINCE THE ALREADY RUNNING FACTORY WILL DO IT ANYWAY)
-
-				// EVENT
-				_events.OnHit(operationId, key, memoryEntryIsValid == false);
-
-				return memoryEntry;
-			}
-
 			bool isStale;
 			bool factoryCompletedSuccessfully = false;