Author: tolusha Date: 2010-10-19 07:35:09 -0400 (Tue, 19 Oct 2010) New Revision: 3299 Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/CacheableLockManagerImpl.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/ControllerCacheLoader.java Log: JCR-1482: Fix issue when after restarting JCR doesn't retrieve all lock data from DB. After restarting server node will remain locked as expected. Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/CacheableLockManagerImpl.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/CacheableLockManagerImpl.java 2010-10-19 08:11:37 UTC (rev 3298) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/CacheableLockManagerImpl.java 2010-10-19 11:35:09 UTC (rev 3299) @@ -1065,7 +1065,7 @@ { public List<LockData> execute(Object arg) throws LockException { - Set<Object> nodesId = ((CacheSPI<Serializable, Object>)cache).getNode(lockRoot).getChildrenNamesDirect(); + Set<Object> nodesId = cache.getChildrenNames(lockRoot); List<LockData> locksData = new ArrayList<LockData>(); for (Object nodeId : nodesId) Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/ControllerCacheLoader.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/ControllerCacheLoader.java 2010-10-19 08:11:37 UTC (rev 3298) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/ControllerCacheLoader.java 2010-10-19 11:35:09 UTC (rev 3299) @@ -169,14 +169,7 @@ */ public Set<?> getChildrenNames(Fqn fqn) throws Exception { - if (cache.getCacheStatus() == CacheStatus.STARTING) - { - // Try to get the list of children name from the nested cache loader - return cl.getChildrenNames(fqn); - } - // All the data is loaded at startup, so no need to call the nested cache loader for another - // cache status other than CacheStatus.STARTING - return null; + return cl.getChildrenNames(fqn); } /**