From fd586445a47d50ebfff67a7d5e4a329cf064cb92 Mon Sep 17 00:00:00 2001 From: Giuseppe Castagno Date: Thu, 14 Jan 2016 18:11:28 +0100 Subject: 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 Reviewed-by: Giuseppe Castagno --- ucb/source/ucp/webdav-neon/webdavcontent.cxx | 5 +++-- 1 file 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 ) ) { -- cgit