Fixed the bug in Issue aliostad#142.

Reyhn3 · Oct 29, 2015 · ba93401 · ba93401
1 parent b77fd60
commit ba93401
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 13 deletions.
diff --git a/src/CacheCow.Client/CachingHandler.cs b/src/CacheCow.Client/CachingHandler.cs
@@ -477,14 +477,19 @@ protected override Task<HttpResponseMessage> SendAsync(HttpRequestMessage reques
 
             // update only if server had a cachecontrol.
             // TODO: merge CacheControl headers instead of replace
-            if (serverResponse.Headers.CacheControl != null && (!serverResponse.Headers.CacheControl.NoCache)) // added to cover issue #139
-            {
-                TraceWriter.WriteLine("CachingHandler.UpdateCachedResponse - CacheControl: " + serverResponse.Headers.CacheControl.ToString(), TraceLevel.Verbose);
-                cachedResponse.Headers.CacheControl = serverResponse.Headers.CacheControl;
-                cachedResponse.Headers.Date = DateTimeOffset.UtcNow; // very important
-                store.AddOrUpdate(cacheKey, cachedResponse);
-            }
-        }
+	        if (serverResponse.Headers.CacheControl != null && (!serverResponse.Headers.CacheControl.NoCache)) // added to cover issue #139
+	        {
+		        TraceWriter.WriteLine("CachingHandler.UpdateCachedResponse - CacheControl: " + serverResponse.Headers.CacheControl.ToString(), TraceLevel.Verbose);
+		        cachedResponse.Headers.CacheControl = serverResponse.Headers.CacheControl;
+	        }
+	        else
+	        {
+				TraceWriter.WriteLine("CachingHandler.UpdateCachedResponse - CacheControl missing from server. Applying sliding expiration. Date => " + DateTimeOffset.UtcNow, TraceLevel.Verbose);
+			}
+
+			cachedResponse.Headers.Date = DateTimeOffset.UtcNow; // very important
+			store.AddOrUpdate(cacheKey, cachedResponse);
+		}
 
         private static void DoCacheValidationForGet(HttpRequestMessage request, CacheCowHeader cacheCowHeader,
             HttpResponseMessage cachedResponse)

diff --git a/test/CacheCow.Client.Tests/CachingHandlerTests.cs b/test/CacheCow.Client.Tests/CachingHandlerTests.cs
@@ -174,8 +174,8 @@ public void Get_Must_Revalidate_Etag_NotModified()
 			responseFromCache.Content.Headers.Expires = DateTime.Now.Subtract(TimeSpan.FromSeconds(10));
 			var responseFromServer = new HttpResponseMessage(HttpStatusCode.NotModified);
 			_messageHandler.Response = responseFromServer;
-			_cacheStore.Expect(x => x.TryGetValue(Arg<CacheKey>.Is.Anything,
-				  out Arg<HttpResponseMessage>.Out(responseFromCache).Dummy)).Return(true);
+			_cacheStore.Expect(x => x.TryGetValue(Arg<CacheKey>.Is.Anything, out Arg<HttpResponseMessage>.Out(responseFromCache).Dummy)).Return(true);
+			_cacheStore.Expect(x => x.AddOrUpdate(Arg<CacheKey>.Is.Anything, Arg<HttpResponseMessage>.Is.Anything));
 
 			_mockRepository.ReplayAll();
 
@@ -208,8 +208,8 @@ public void Get_Must_Revalidate_Expires_NotModified()
 
 			var responseFromServer = new HttpResponseMessage(HttpStatusCode.NotModified);
 			_messageHandler.Response = responseFromServer;
-			_cacheStore.Expect(x => x.TryGetValue(Arg<CacheKey>.Is.Anything,
-				  out Arg<HttpResponseMessage>.Out(responseFromCache).Dummy)).Return(true);
+			_cacheStore.Expect(x => x.TryGetValue(Arg<CacheKey>.Is.Anything, out Arg<HttpResponseMessage>.Out(responseFromCache).Dummy)).Return(true);
+			_cacheStore.Expect(x => x.AddOrUpdate(Arg<CacheKey>.Is.Anything, Arg<HttpResponseMessage>.Is.Anything));
 
 			_mockRepository.ReplayAll();
 
@@ -335,7 +335,6 @@ public void Get_NoCache_Expires_ResultsInValidation()
 
         }
 
-
         [Test]
         public void Get_NoMustRevalidate_NoMustRevalidateByDefault_Expires_GetFromCache()
         {