Fix distributed cache null guard

#68
stefanprodan · Feb 28, 2019 · fcb66fb · fcb66fb · TrieBr · Mar 12, 2019
1 parent 34f5c25
commit fcb66fb
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/src/AspNetCoreRateLimit/Store/DistributedCacheRateLimitStore.cs b/src/AspNetCoreRateLimit/Store/DistributedCacheRateLimitStore.cs
@@ -17,10 +17,14 @@ public DistributedCacheRateLimitStore(IDistributedCache cache)
 
         public Task SetAsync(string id, T entry, TimeSpan? expirationTime = null, CancellationToken cancellationToken = default)
         {
-            return _cache.SetStringAsync(id,
-                JsonConvert.SerializeObject(entry),
-                expirationTime.HasValue ? new DistributedCacheEntryOptions().SetAbsoluteExpiration(expirationTime.Value) : null,
-                cancellationToken);
+            var options = new DistributedCacheEntryOptions();
+
+            if (expirationTime.HasValue)
+            {
+                options.SetAbsoluteExpiration(expirationTime.Value);
+            }
+
+            return _cache.SetStringAsync(id, JsonConvert.SerializeObject(entry), options, cancellationToken);
         }
 
         public async Task<bool> ExistsAsync(string id, CancellationToken cancellationToken = default)

diff --git a/src/AspNetCoreRateLimit/Store/MemoryCacheRateLimitStore.cs b/src/AspNetCoreRateLimit/Store/MemoryCacheRateLimitStore.cs
@@ -38,7 +38,7 @@ public Task RemoveAsync(string id, CancellationToken cancellationToken = default
 
         public Task SetAsync(string id, T entry, TimeSpan? expirationTime = null, CancellationToken cancellationToken = default)
         {
-            MemoryCacheEntryOptions options = new MemoryCacheEntryOptions
+            var options = new MemoryCacheEntryOptions
             {
                 Priority = CacheItemPriority.NeverRemove
             };