summaryrefslogtreecommitdiff
path: root/ucb
diff options
context:
space:
mode:
authorMichael Stahl <michael.stahl@allotropia.de>2023-04-18 14:25:37 +0200
committerThorsten Behrens <thorsten.behrens@allotropia.de>2023-04-25 17:17:27 +0200
commitbb0e041a237a1c4ad4f5c0bd092fc3da5c18b7f1 (patch)
tree73b7f0432b1bb8be67a524d7e977c1d189a769ba /ucb
parent5f0e276336bc130b15480a04ec1cc6a9a1c9e93b (diff)
Fix tdf#155004: ucb: webdav-curl: carry over Class1 bit only if set
With d6182cb6704c06f33d284874b9fe96c85cce5bf5 there are cases when a webdav server inadvertendly releases the lock. Lets apply the fix only if the Class1 flag is actually set. Change-Id: I85e5253c7df0980f373d2dea788c331b81ed4a82 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150552 Tested-by: László Németh <nemeth@numbertext.org> Reviewed-by: László Németh <nemeth@numbertext.org> Tested-by: Jenkins
Diffstat (limited to 'ucb')
-rw-r--r--ucb/source/ucp/webdav-curl/DAVTypes.cxx5
1 files changed, 4 insertions, 1 deletions
diff --git a/ucb/source/ucp/webdav-curl/DAVTypes.cxx b/ucb/source/ucp/webdav-curl/DAVTypes.cxx
index d5b255c175cd..e41c5426e959 100644
--- a/ucb/source/ucp/webdav-curl/DAVTypes.cxx
+++ b/ucb/source/ucp/webdav-curl/DAVTypes.cxx
@@ -168,7 +168,10 @@ void DAVOptionsCache::addDAVOptions( DAVOptions & rDAVOptions, const sal_uInt32
// tdf#153642 keep cached Class1 bit at aDAVOptionsException to avoid of
// losing the ability to resave the document within the lifetime because
// of disabled DAV detection in getResourceType()
- rDAVOptions.setClass1( (*it).second.isClass1() );
+ if ((*it).second.isClass1())
+ {
+ rDAVOptions.setClass1( (*it).second.isClass1() );
+ }
}
// not in cache, add it
TimeValue t1;