[292375] CDO Server does not honor config settings for currentLRUCapacity and revisedLRUCapacity

https://bugs.eclipse.org/bugs/show_bug.cgi?id=292375

1 files changed, 11 insertions, 2 deletions

diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/RevisionManager.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/RevisionManager.java
index 4e909de3e2..ddfe19c6b3 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/RevisionManager.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/RevisionManager.java
@@ -18,6 +18,7 @@ import org.eclipse.emf.cdo.common.model.CDOModelUtil;
 import org.eclipse.emf.cdo.common.revision.cache.CDORevisionCache;
 import org.eclipse.emf.cdo.internal.common.revision.CDORevisionResolverImpl;
 import org.eclipse.emf.cdo.internal.common.revision.cache.lru.LRURevisionCache;
+import org.eclipse.emf.cdo.internal.common.revision.cache.two.TwoLevelRevisionCache;
 import org.eclipse.emf.cdo.server.IRepository;
 import org.eclipse.emf.cdo.server.IRevisionManager;
 import org.eclipse.emf.cdo.server.IStoreAccessor;
@@ -303,12 +304,14 @@ public class RevisionManager extends CDORevisionResolverImpl implements IRevisio
   protected void doBeforeActivate() throws Exception
   {
     super.doBeforeActivate();
+    applyLRUSettings(getCache());
+  }
 
-    CDORevisionCache cache = getCache();
+  private void applyLRUSettings(CDORevisionCache cache)
+  {
     if (cache instanceof LRURevisionCache)
     {
       LRURevisionCache lruCache = (LRURevisionCache)cache;
-
       Integer currentLRUCapacity = getIntegerProperty(Props.CURRENT_LRU_CAPACITY);
       if (currentLRUCapacity != null)
       {
@@ -321,6 +324,12 @@ public class RevisionManager extends CDORevisionResolverImpl implements IRevisio
         lruCache.setCapacityRevised(revisedLRUCapacity);
       }
     }
+    else if (cache instanceof TwoLevelRevisionCache)
+    {
+      TwoLevelRevisionCache twoLevelCache = (TwoLevelRevisionCache)cache;
+      applyLRUSettings(twoLevelCache.getLevel1());
+      applyLRUSettings(twoLevelCache.getLevel2());
+    }
   }
 
   private Integer getIntegerProperty(String key)