Author: areshetnyak Date: 2010-01-21 08:35:02 -0500 (Thu, 21 Jan 2010) New Revision: 1526 Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/CacheableLockManager.java Log: EXOJCR-332 : Move code from start in CacheableLockManager Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/CacheableLockManager.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/CacheableLockManager.java 2010-01-21 13:33:46 UTC (rev 1525) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/CacheableLockManager.java 2010-01-21 13:35:02 UTC (rev 1526) @@ -215,9 +215,6 @@ .getCacheConfig(); CacheFactory<Serializable, Object> factory = new DefaultCacheFactory<Serializable, Object>(); - // Context recall is a workaround of JDBCCacheLoader starting. - context.recall(); - cache = factory.createCache(pathToConfig, false); if (transactionService.getTransactionManager() != null) @@ -226,6 +223,15 @@ } cache.create(); + cache.start(); + + if (!cache.getRoot().hasChild(lockRoot)) + { + cache.getRoot().addChild(lockRoot); + } + + // Context recall is a workaround of JDBCCacheLoader starting. + context.recall(); } else { @@ -477,15 +483,6 @@ */ public void start() { - cache.start(); - - if (!cache.getRoot().hasChild(lockRoot)) - { - cache.getRoot().addChild(lockRoot); - } - - // Context recall is a workaround of JDBCCacheLoader starting. - context.recall(); lockRemover = new LockRemover(this); }