From 5f08dbafd1e1fd5d26deece2afde2d1f785bb8ef Mon Sep 17 00:00:00 2001
From: Jeroen <jeroen.b.k@hotmail.com>
Date: Tue, 9 Jun 2020 17:46:24 +0200
Subject: [PATCH] Force set cookie if exception occurs when getting cookie

---
 src/CookieManager/DefaultCookieManager.cs | 120 ++++++++++------------
 1 file changed, 56 insertions(+), 64 deletions(-)

diff --git a/src/CookieManager/DefaultCookieManager.cs b/src/CookieManager/DefaultCookieManager.cs
index 8e6ad06..cc83269 100644
--- a/src/CookieManager/DefaultCookieManager.cs
+++ b/src/CookieManager/DefaultCookieManager.cs
@@ -4,10 +4,10 @@
 
 namespace CookieManager
 {
-	/// <summary>
-	/// Implementation of <see cref="ICookieManager" /> 
-	/// </summary>
-	public class DefaultCookieManager : ICookieManager
+    /// <summary>
+    /// Implementation of <see cref="ICookieManager" /> 
+    /// </summary>
+    public class DefaultCookieManager : ICookieManager
     {
         private readonly ICookie _cookie;
 
@@ -22,30 +22,26 @@ public bool Contains(string key)
             return _cookie.Contains(key);
         }
 
-		/// <summary>
-		/// Get the value or set the value if specified key is expire
-		/// </summary>
-		/// <typeparam name="T">TSource</typeparam>
-		/// <param name="key">Key</param>
-		/// <param name="acquirer">action to execute</param>
-		/// <param name="expireTime">Expire time</param>
-		/// <returns>TSource object</returns>
-        public T GetOrSet<T>(string key, Func<T> acquirer, int? expireTime = default(int?))
+        /// <summary>
+        /// Get the value or set the value if specified key is expire
+        /// </summary>
+        /// <typeparam name="T">TSource</typeparam>
+        /// <param name="key">Key</param>
+        /// <param name="acquirer">action to execute</param>
+        /// <param name="expireTime">Expire time</param>
+        /// <returns>TSource object</returns>
+        public T GetOrSet<T>(string key, Func<T> acquirer, int? expireTime = default)
         {
-            if(_cookie.Contains(key))
+            try
             {
-                //get the existing value
-               return GetExisting<T>(key);
+                return GetExisting<T>(key);
             }
-            else
-            {
-                var value = acquirer();
-                this.Set(key, value, expireTime);
+            catch { }
 
-                return value;
-            }
+            var value = acquirer();
+            Set(key, value, expireTime);
 
-            return GetExisting<T>(key);
+            return value;
         }
 
         private T GetExisting<T>(string key)
@@ -58,59 +54,55 @@ private T GetExisting<T>(string key)
             return JsonConvert.DeserializeObject<T>(value);
         }
 
-		/// <summary>
-		/// remove the key
-		/// </summary>
-		/// <param name="key"></param>
+        /// <summary>
+        /// remove the key
+        /// </summary>
+        /// <param name="key"></param>
         public void Remove(string key)
         {
             _cookie.Remove(key);
         }
 
-		/// <summary>
-		/// set the value 
-		/// </summary>
-		/// <param name="key">key</param>
-		/// <param name="value">value</param>
-		/// <param name="expireTime"></param>
+        /// <summary>
+        /// set the value 
+        /// </summary>
+        /// <param name="key">key</param>
+        /// <param name="value">value</param>
+        /// <param name="expireTime"></param>
         public void Set(string key, object value, int? expireTime = default(int?))
         {
             _cookie.Set(key, JsonConvert.SerializeObject(value), expireTime);
         }
 
-		
-		/// <summary>
-		/// get the value of specified key
-		/// </summary>
-		/// <typeparam name="T">T object</typeparam>
-		/// <param name="key">Key</param>
-		/// <returns>T object</returns>
-		public T Get<T>(string key)
+
+        /// <summary>
+        /// get the value of specified key
+        /// </summary>
+        /// <typeparam name="T">T object</typeparam>
+        /// <param name="key">Key</param>
+        /// <returns>T object</returns>
+        public T Get<T>(string key)
         {
             return GetExisting<T>(key);
         }
 
-		public void Set(string key, object value, CookieOptions option)
-		{
-			_cookie.Set(key, JsonConvert.SerializeObject(value), option);
-		}
-
-		public T GetOrSet<T>(string key, Func<T> acquirer, CookieOptions option)
-		{
-			if (_cookie.Contains(key))
-			{
-				//get the existing value
-				return GetExisting<T>(key);
-			}
-			else
-			{
-				var value = acquirer();
-				this.Set(key, value, option);
-
-				return value;
-			}
-
-			return GetExisting<T>(key);
-		}
-	}
+        public void Set(string key, object value, CookieOptions option)
+        {
+            _cookie.Set(key, JsonConvert.SerializeObject(value), option);
+        }
+
+        public T GetOrSet<T>(string key, Func<T> acquirer, CookieOptions option)
+        {
+            try
+            {
+                return GetExisting<T>(key);
+            }
+            catch { }
+
+            var value = acquirer();
+            Set(key, value, option);
+
+            return value;
+        }
+    }
 }