Fixing the minimum cache timeout validation #159 (it is too early...)

MichaCo · Jun 5, 2017 · c7956bc · c7956bc
1 parent 31e9e7b
commit c7956bc
Showing 1 changed file with 14 additions and 16 deletions.
diff --git a/src/CacheManager.StackExchange.Redis/RedisCacheHandle.cs b/src/CacheManager.StackExchange.Redis/RedisCacheHandle.cs
@@ -296,10 +296,8 @@ public override UpdateItemResult<TCacheValue> Update(string key, string region,
                     {
                         return UpdateItemResult.ForItemDidNotExist<TCacheValue>();
                     }
-                    if (item.ExpirationTimeout < MinimumExpirationTimeout)
-                    {
-                        throw new ArgumentException("Timeout lower than one millisecond is not supported.", nameof(item.ExpirationTimeout));
-                    }
+
+                    ValidateExpirationTimeout(item);
 
                     // run update
                     var newValue = updateValue(item.Value);
@@ -357,10 +355,8 @@ protected UpdateItemResult<TCacheValue> UpdateNoScript(string key, string region
                     {
                         return UpdateItemResult.ForItemDidNotExist<TCacheValue>();
                     }
-                    if (item.ExpirationTimeout < MinimumExpirationTimeout)
-                    {
-                        throw new ArgumentException("Timeout lower than one millisecond is not supported.", nameof(item.ExpirationTimeout));
-                    }
+
+                    ValidateExpirationTimeout(item);
 
                     var oldValue = ToRedisValue(item.Value);
 
@@ -754,6 +750,14 @@ private static Tuple<string, string> ParseKey(string value)
             return Tuple.Create(key, region);
         }
 
+        private static void ValidateExpirationTimeout(CacheItem<TCacheValue> item)
+        {
+            if ((item.ExpirationMode == ExpirationMode.Absolute || item.ExpirationMode == ExpirationMode.Sliding) && item.ExpirationTimeout < MinimumExpirationTimeout)
+            {
+                throw new ArgumentException("Timeout lower than one millisecond is not supported.", nameof(item.ExpirationTimeout));
+            }
+        }
+
         private string GetKey(string key, string region = null)
         {
             if (string.IsNullOrWhiteSpace(key))
@@ -833,10 +837,7 @@ private bool Set(CacheItem<TCacheValue> item, When when, bool sync = false)
 
             var flags = sync ? CommandFlags.None : CommandFlags.FireAndForget;
 
-            if (item.ExpirationTimeout < MinimumExpirationTimeout)
-            {
-                throw new ArgumentException("Timeout lower than one millisecond is not supported.", nameof(item.ExpirationTimeout));
-            }
+            ValidateExpirationTimeout(item);
 
             // ARGV [1]: value, [2]: type, [3]: expirationMode, [4]: expirationTimeout(millis), [5]: created(ticks)
             var parameters = new RedisValue[]
@@ -916,10 +917,7 @@ private bool SetNoScript(CacheItem<TCacheValue> item, When when, bool sync = fal
                 var fullKey = GetKey(item.Key, item.Region);
                 var value = ToRedisValue(item.Value);
 
-                if (item.ExpirationTimeout < MinimumExpirationTimeout)
-                {
-                    throw new ArgumentException("Timeout lower than one millisecond is not supported.", nameof(item.ExpirationTimeout));
-                }
+                ValidateExpirationTimeout(item);
 
                 var metaValues = new[]
                 {