inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)

Browse Source 
65603: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (4.3/Cloud)
      65504: Merged DEV to V4.2-BUG-FIX (4.2.2)
         64017 : MNT-10908 : WebDAV lock refresh calls are not processed
            - LOCK method was modified to update lock expiry date correctly.
            - PROPFIND method should not generated lock discovery response for expired locks
         64152 : MNT-10908 : WebDAV lock refresh calls are not processed
            - Unit tests to prove the fix. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@66255 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-04-02 21:59:20 +00:00
parent 265620433f
commit afcd38825f
4 changed files with 295 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
source/java/org/alfresco/repo/webdav/LockMethod.java
View File

@@ -459,6 +459,7 @@ public class LockMethod extends WebDAVMethod
{
// Update the expiry for the lock
lockInfo.setTimeoutSeconds(getLockTimeout());
getDAVLockService().lock(lockNode.getNodeRef(), lockInfo);
}
}

2
source/java/org/alfresco/repo/webdav/PropFindMethod.java
View File

@@ -922,7 +922,7 @@ public class PropFindMethod extends WebDAVMethod
{
// Output the lock status response
LockInfo lockInfo = getNodeLockInfo(nodeInfo);
if (lockInfo.isLocked())
if (lockInfo.isLocked() && !lockInfo.isExpired())
{
generateLockDiscoveryXML(xml, nodeInfo, lockInfo);
}