ucb/source/ucp/webdav-curl/webdavcontent.cxx | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 8ce2732f0a867807a9d0e70ec0966e7779d13412
Author: Giuseppe Castagno <giuseppe.casta...@acca-esse.eu>
AuthorDate: Thu Jan 14 18:11:28 2016 +0100
Commit: Michael Stahl <michael.st...@allotropia.de>
CommitDate: Mon Nov 1 18:35:04 2021 +0100
ucb: webdav-curl: 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.
[ port of commit fd586445a47d50ebfff67a7d5e4a329cf064cb92 ]
Change-Id: I639c558c6e6f322f37d267bbc31309504745e02c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123289
Tested-by: Michael Stahl <michael.st...@allotropia.de>
Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
diff --git a/ucb/source/ucp/webdav-curl/webdavcontent.cxx
b/ucb/source/ucp/webdav-curl/webdavcontent.cxx
index b499327878d1..96ac6dde122a 100644
--- a/ucb/source/ucp/webdav-curl/webdavcontent.cxx
+++ b/ucb/source/ucp/webdav-curl/webdavcontent.cxx
@@ -658,8 +658,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 ) )
