From 2a96f57a17a61851eb8dae628af04935e275a7b6 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Wed, 12 Feb 2014 01:00:01 +0000 Subject: [PATCH] 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 --- .../repo/content/caching/quota/StandardQuotaStrategyTest.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/source/test-java/org/alfresco/repo/content/caching/quota/StandardQuotaStrategyTest.java b/source/test-java/org/alfresco/repo/content/caching/quota/StandardQuotaStrategyTest.java index 07017dff80..44da79a431 100644 --- a/source/test-java/org/alfresco/repo/content/caching/quota/StandardQuotaStrategyTest.java +++ b/source/test-java/org/alfresco/repo/content/caching/quota/StandardQuotaStrategyTest.java @@ -92,6 +92,8 @@ public class StandardQuotaStrategyTest cacheRoot = cache.getCacheRoot(); quota = (StandardQuotaStrategy) ctx.getBean("quotaManager"); quota.setCurrentUsageBytes(0); + // No file size limit + quota.setMaxFileSizeMB(0); cleaner = (CachedContentCleaner) ctx.getBean("cachedContentCleaner"); // Empty the in-memory cache cache.removeAll();