From bb8fd4c88bff8abc09028ac3de0684e33685218b Mon Sep 17 00:00:00 2001
From: Matt Ward <matt.ward@alfresco.com>
Date: Fri, 23 Mar 2012 10:34:19 +0000
Subject: [PATCH] ALF-10636: CachingContentStore: afterWritingCacheFile()
 return value is ignored

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@34711 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../content/caching/CachingContentStore.java  | 14 ++++++++--
 .../caching/CachingContentStoreTest.java      | 26 +++++++++++++++++++
 2 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/source/java/org/alfresco/repo/content/caching/CachingContentStore.java b/source/java/org/alfresco/repo/content/caching/CachingContentStore.java
index 03d6b1de34..6e7fc581e6 100644
--- a/source/java/org/alfresco/repo/content/caching/CachingContentStore.java
+++ b/source/java/org/alfresco/repo/content/caching/CachingContentStore.java
@@ -215,8 +215,18 @@ public class CachingContentStore implements ContentStore, ApplicationEventPublis
                 
                 if (reader != null)
                 {
-                    quota.afterWritingCacheFile(contentSize);
-                    return reader;
+                    boolean keepCacheFile = quota.afterWritingCacheFile(contentSize);
+                    if (keepCacheFile)
+                    {
+                        return reader;
+                    }
+                    else
+                    {
+                        // Quota strategy has requested cache file not to be kept.
+                        cache.deleteFile(url);
+                        cache.remove(url);
+                        return backingStore.getReader(url);
+                    }
                 }
             }
             // Have tried multiple times to cache the item and read it back from the cache
diff --git a/source/java/org/alfresco/repo/content/caching/CachingContentStoreTest.java b/source/java/org/alfresco/repo/content/caching/CachingContentStoreTest.java
index 1e38a6d01e..4f601a3d9e 100644
--- a/source/java/org/alfresco/repo/content/caching/CachingContentStoreTest.java
+++ b/source/java/org/alfresco/repo/content/caching/CachingContentStoreTest.java
@@ -108,6 +108,7 @@ public class CachingContentStoreTest
         QuotaManagerStrategy quota = mock(QuotaManagerStrategy.class);
         cachingStore.setQuota(quota);
         when(quota.beforeWritingCacheFile(1274L)).thenReturn(true);
+        when(quota.afterWritingCacheFile(1274L)).thenReturn(true);
         
         ContentReader returnedReader = cachingStore.getReader("url");
         
@@ -286,6 +287,31 @@ public class CachingContentStoreTest
         verify(cache).remove("url");
     }
     
+    @Test
+    public void quotaManagerCanRequestFileDeletionFromCacheAfterWriteWhenNotCacheOnInbound()
+    {
+        when(cache.getReader("url")).thenReturn(cachedContent);
+        when(backingStore.getReader("url")).thenReturn(sourceContent);
+        when(sourceContent.getSize()).thenReturn(1274L);
+        when(cache.put("url", sourceContent)).thenReturn(true);
+        
+        QuotaManagerStrategy quota = mock(QuotaManagerStrategy.class);
+        cachingStore.setQuota(quota);
+        
+        // Don't veto writing the cache file.
+        when(quota.beforeWritingCacheFile(1274L)).thenReturn(true);
+        // Do request cache file deletion.
+        when(quota.afterWritingCacheFile(1234L)).thenReturn(false);
+        
+        ContentReader returnedReader = cachingStore.getReader("url");
+        
+        // Was the file deleted?
+        verify(cache).deleteFile("url");
+        verify(cache).remove("url");
+        // As the cache file has been deleted, the reader must come from the backing store
+        // rather than the cache.
+        assertSame(returnedReader, sourceContent);
+    }
     
     @Test(expected=RuntimeException.class)
     // Check that exceptions raised by the backing store's putContent(ContentReader)