[exo-jcr-commits] exo-jcr SVN: r2588 - jcr/branches/1.12-SEC/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock.

Author: skabashnyuk Date: 2010-06-15 04:09:07 -0400 (Tue, 15 Jun 2010) New Revision: 2588 Modified: jcr/branches/1.12-SEC/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/LockManagerImpl.java Log: EXOJCR-781 : make the same as CacheableLockManagerImpl Modified: jcr/branches/1.12-SEC/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/LockManagerImpl.java =================================================================== --- jcr/branches/1.12-SEC/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/LockManagerImpl.java 2010-06-15 08:07:13 UTC (rev 2587) +++ jcr/branches/1.12-SEC/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/LockManagerImpl.java 2010-06-15 08:09:07 UTC (rev 2588) @@ -51,6 +51,7 @@ import org.exoplatform.services.jcr.util.IdGenerator; import org.exoplatform.services.log.ExoLogger; import org.exoplatform.services.log.Log; +import org.exoplatform.services.naming.InitialContextInitializer; import org.picocontainer.Startable; import java.io.IOException; @@ -145,12 +146,12 @@ * @param dataManager * @param config */ - public LockManagerImpl(WorkspacePersistentDataManager dataManager, WorkspaceEntry config) + public LockManagerImpl(WorkspacePersistentDataManager dataManager, WorkspaceEntry config,InitialContextInitializer context) { - this(dataManager, config, null); + this(dataManager, config, null,context); } - public LockManagerImpl(WorkspacePersistentDataManager dataManager, WorkspaceEntry config, LockPersister persister) + public LockManagerImpl(WorkspacePersistentDataManager dataManager, WorkspaceEntry config, LockPersister persister,InitialContextInitializer context) { this.dataManager = dataManager; @@ -168,6 +169,8 @@ tokensMap = new HashMap<String, LockData>(); dataManager.addItemPersistenceListener(this); + // Context recall is a workaround of JDBCCacheLoader starting. + context.recall(); } public synchronized void addLockToken(String sessionId, String lt)