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-QA to HEAD (4.2) (including moving test classes into separate folders)

Browse Source 
51903 to 54309 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54310 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Samuel Langlois
2013-08-20 17:17:31 +00:00
parent a91f6e2535
commit 788d3c9c89
777 changed files with 77820 additions and 23746 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -921,19 +921,10 @@ public class PropFindMethod extends WebDAVMethod
protected void generateLockDiscoveryResponse(XMLWriter xml, FileInfo nodeInfo, boolean isDir) throws Exception
{
// Output the lock status response
LockInfo lockInfo = getNodeLockInfo(nodeInfo);
lockInfo.getRWLock().readLock().lock();
try
if (lockInfo.isLocked())
{
if (lockInfo.isLocked())
{
generateLockDiscoveryXML(xml, nodeInfo, lockInfo);
}
}
finally
{
lockInfo.getRWLock().readLock().unlock();
generateLockDiscoveryXML(xml, nodeInfo, lockInfo);
}
}
@@ -951,9 +942,8 @@ public class PropFindMethod extends WebDAVMethod
xml.startElement(WebDAV.DAV_NS, WebDAV.XML_SUPPORTED_LOCK, WebDAV.XML_NS_SUPPORTED_LOCK, nullAttr);
// Output exclusive lock
// Shared locks are not supported, as they cannot be supported by the LockService (relevant to ALF-16449).
writeLock(xml, WebDAV.XML_NS_EXCLUSIVE);
// Output shared lock
writeLock(xml, WebDAV.XML_NS_SHARED);
xml.endElement(WebDAV.DAV_NS, WebDAV.XML_SUPPORTED_LOCK, WebDAV.XML_NS_SUPPORTED_LOCK);
}