From 9c8545f6b4f1c3b13a1e8e3b273690dbd83cf121 Mon Sep 17 00:00:00 2001
From: Matt Ward <matt.ward@alfresco.com>
Date: Fri, 18 May 2012 18:10:02 +0000
Subject: [PATCH] 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
---
 source/java/org/alfresco/repo/webdav/WebDAVLockServiceImpl.java | 2 +-
 .../org/alfresco/repo/webdav/WebDAVLockServiceImplTest.java     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/source/java/org/alfresco/repo/webdav/WebDAVLockServiceImpl.java b/source/java/org/alfresco/repo/webdav/WebDAVLockServiceImpl.java
index e39e947a0d..17193aa8ff 100644
--- a/source/java/org/alfresco/repo/webdav/WebDAVLockServiceImpl.java
+++ b/source/java/org/alfresco/repo/webdav/WebDAVLockServiceImpl.java
@@ -90,7 +90,7 @@ public class WebDAVLockServiceImpl implements WebDAVLockService
      */
     public void setLockStoreFactory(LockStoreFactory lockStoreFactory)
     {
-        LockStore lockStore = lockStoreFactory.getLockStore();
+        LockStore lockStore = lockStoreFactory.createLockStore();
         this.lockStore = lockStore;
     }
 
diff --git a/source/java/org/alfresco/repo/webdav/WebDAVLockServiceImplTest.java b/source/java/org/alfresco/repo/webdav/WebDAVLockServiceImplTest.java
index a8e8d6c324..3cab3c5f02 100644
--- a/source/java/org/alfresco/repo/webdav/WebDAVLockServiceImplTest.java
+++ b/source/java/org/alfresco/repo/webdav/WebDAVLockServiceImplTest.java
@@ -53,7 +53,7 @@ public class WebDAVLockServiceImplTest
     {
         davLockService = new WebDAVLockServiceImpl();
         LockStoreFactory lockStoreFactory = Mockito.mock(LockStoreFactory.class);
-        Mockito.when(lockStoreFactory.getLockStore()).thenReturn(lockStore);
+        Mockito.when(lockStoreFactory.createLockStore()).thenReturn(lockStore);
         davLockService.setLockStoreFactory(lockStoreFactory);
         davLockService.setNodeService(nodeService);
         davLockService.setCheckOutCheckInService(cociService);