mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-14 17:58:59 +00:00
Merged BRANCHES/DEV/mward/cifs_hazelcast_conf to HEAD:
36500: ALF-13821: CIFS and WebDAV should use same Hazelcast configuration mechanism 36507: ALF-13821: CIFS and WebDAV should use same Hazelcast configuration mechanism 36511: ALF-13821: CIFS and WebDAV should use same Hazelcast configuration mechanism 36519: ALF-13821: Extract hazelcastConfig, hazelcastInstanceFactory bean definitions from webdav-context.xml to cluster-context.xml 36553: ALF-13821: CIFS and WebDAV should use same Hazelcast configuration mechanism git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@36581 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -90,7 +90,7 @@ public class WebDAVLockServiceImpl implements WebDAVLockService
|
|||||||
*/
|
*/
|
||||||
public void setLockStoreFactory(LockStoreFactory lockStoreFactory)
|
public void setLockStoreFactory(LockStoreFactory lockStoreFactory)
|
||||||
{
|
{
|
||||||
LockStore lockStore = lockStoreFactory.getLockStore();
|
LockStore lockStore = lockStoreFactory.createLockStore();
|
||||||
this.lockStore = lockStore;
|
this.lockStore = lockStore;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -53,7 +53,7 @@ public class WebDAVLockServiceImplTest
|
|||||||
{
|
{
|
||||||
davLockService = new WebDAVLockServiceImpl();
|
davLockService = new WebDAVLockServiceImpl();
|
||||||
LockStoreFactory lockStoreFactory = Mockito.mock(LockStoreFactory.class);
|
LockStoreFactory lockStoreFactory = Mockito.mock(LockStoreFactory.class);
|
||||||
Mockito.when(lockStoreFactory.getLockStore()).thenReturn(lockStore);
|
Mockito.when(lockStoreFactory.createLockStore()).thenReturn(lockStore);
|
||||||
davLockService.setLockStoreFactory(lockStoreFactory);
|
davLockService.setLockStoreFactory(lockStoreFactory);
|
||||||
davLockService.setNodeService(nodeService);
|
davLockService.setNodeService(nodeService);
|
||||||
davLockService.setCheckOutCheckInService(cociService);
|
davLockService.setCheckOutCheckInService(cociService);
|
||||||
|
Reference in New Issue
Block a user