Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)

59115: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      59087: Fix broken test StandardQuotaStrategyTest.cachingIsDisabledAtCorrectThreshold


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62095 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-02-12 01:00:01 +00:00
parent d156901f44
commit 2a96f57a17

View File

@@ -92,6 +92,8 @@ public class StandardQuotaStrategyTest
cacheRoot = cache.getCacheRoot(); cacheRoot = cache.getCacheRoot();
quota = (StandardQuotaStrategy) ctx.getBean("quotaManager"); quota = (StandardQuotaStrategy) ctx.getBean("quotaManager");
quota.setCurrentUsageBytes(0); quota.setCurrentUsageBytes(0);
// No file size limit
quota.setMaxFileSizeMB(0);
cleaner = (CachedContentCleaner) ctx.getBean("cachedContentCleaner"); cleaner = (CachedContentCleaner) ctx.getBean("cachedContentCleaner");
// Empty the in-memory cache // Empty the in-memory cache
cache.removeAll(); cache.removeAll();