summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiuseppe Castagno <giuseppe.castagno@acca-esse.eu>2016-01-14 18:11:28 +0100
committerGiuseppe Castagno <giuseppe.castagno@acca-esse.eu>2016-07-29 06:37:42 +0000
commitfd586445a47d50ebfff67a7d5e4a329cf064cb92 (patch)
treee32014a4e8383bdc825d3a3968791baa038898a7
parentf9a56767c6edc36cfd3d593a9b74e1daa8d7fac3 (diff)
tdf#101094 (7) OPTIONS: Remove resourceTypeForLocks before unlock
Not needed, unlock() checks if a lock is present first. If present, it means that LOCK is available, inferring the presence of UNLOCK availability. Change-Id: I007c4b02b27e8a40f15721c0308c894ad6f482fd Reviewed-on: https://gerrit.libreoffice.org/27660 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Giuseppe Castagno <giuseppe.castagno@acca-esse.eu>
-rw-r--r--ucb/source/ucp/webdav-neon/webdavcontent.cxx5
1 files changed, 3 insertions, 2 deletions
diff --git a/ucb/source/ucp/webdav-neon/webdavcontent.cxx b/ucb/source/ucp/webdav-neon/webdavcontent.cxx
index 60e91be3e00c..f91a50cc64ef 100644
--- a/ucb/source/ucp/webdav-neon/webdavcontent.cxx
+++ b/ucb/source/ucp/webdav-neon/webdavcontent.cxx
@@ -614,8 +614,9 @@ uno::Any SAL_CALL Content::execute(
{
// unlock
- if ( resourceTypeForLocks( Environment ) == DAV )
- unlock( Environment );
+ // do not check for a DAV resource
+ // the lock store will be checked before sending
+ unlock( Environment );
}
else if ( aCommand.Name == "createNewContent" && isFolder( Environment ) )
{