From c039b5c4bc876ccbe14df2315472cc747edb2ad6 Mon Sep 17 00:00:00 2001 From: mapogolions Date: Sun, 19 Sep 2021 01:24:57 +0500 Subject: [PATCH 1/2] Remove useless if-else branch --- .../Microsoft.Extensions.Caching.Memory/src/MemoryCache.cs | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/libraries/Microsoft.Extensions.Caching.Memory/src/MemoryCache.cs b/src/libraries/Microsoft.Extensions.Caching.Memory/src/MemoryCache.cs index c14e9f68f11086..5755654be41900 100644 --- a/src/libraries/Microsoft.Extensions.Caching.Memory/src/MemoryCache.cs +++ b/src/libraries/Microsoft.Extensions.Caching.Memory/src/MemoryCache.cs @@ -113,10 +113,6 @@ internal void SetEntry(CacheEntry entry) { absoluteExpiration = utcNow + entry.AbsoluteExpirationRelativeToNow; } - else if (entry.AbsoluteExpiration.HasValue) - { - absoluteExpiration = entry.AbsoluteExpiration; - } // Applying the option's absolute expiration only if it's not already smaller. // This can be the case if a dependent cache entry has a smaller value, and From 9b70efa85ed1a774b2310805d93ac9fbf2182e58 Mon Sep 17 00:00:00 2001 From: mapogolions Date: Sun, 19 Sep 2021 01:27:42 +0500 Subject: [PATCH 2/2] Try to change the absolute expiration only if the relative has value --- .../src/MemoryCache.cs | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/src/libraries/Microsoft.Extensions.Caching.Memory/src/MemoryCache.cs b/src/libraries/Microsoft.Extensions.Caching.Memory/src/MemoryCache.cs index 5755654be41900..2a6e87cf76da13 100644 --- a/src/libraries/Microsoft.Extensions.Caching.Memory/src/MemoryCache.cs +++ b/src/libraries/Microsoft.Extensions.Caching.Memory/src/MemoryCache.cs @@ -108,18 +108,13 @@ internal void SetEntry(CacheEntry entry) DateTimeOffset utcNow = _options.Clock.UtcNow; - DateTimeOffset? absoluteExpiration = null; - if (entry.AbsoluteExpirationRelativeToNow.HasValue) - { - absoluteExpiration = utcNow + entry.AbsoluteExpirationRelativeToNow; - } - // Applying the option's absolute expiration only if it's not already smaller. // This can be the case if a dependent cache entry has a smaller value, and // it was set by cascading it to its parent. - if (absoluteExpiration.HasValue) + if (entry.AbsoluteExpirationRelativeToNow.HasValue) { - if (!entry.AbsoluteExpiration.HasValue || absoluteExpiration.Value < entry.AbsoluteExpiration.Value) + var absoluteExpiration = utcNow + entry.AbsoluteExpirationRelativeToNow.Value; + if (!entry.AbsoluteExpiration.HasValue || absoluteExpiration < entry.AbsoluteExpiration.Value) { entry.AbsoluteExpiration = absoluteExpiration; }