summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2020-03-09 19:31:45 +0100
committerGitHub <noreply@github.com>2020-03-09 19:31:45 +0100
commitb6245be30278f62ff050c97c0e400dba69fd5d43 (patch)
tree56d1dedc212e6bd226eadd9697569e2d6b6d45f5 /apps
parent1f7cb027a4f3169274f6b5861d6d55e1e21ee002 (diff)
parentfab22ac14cb8116006b11cb2bcfe0337daaa2138 (diff)
downloadnextcloud-server-b6245be30278f62ff050c97c0e400dba69fd5d43.tar.gz
nextcloud-server-b6245be30278f62ff050c97c0e400dba69fd5d43.zip
Merge pull request #19746 from nextcloud/locked-exception-forward-existing
pass the existing locks info when making locked exception with absolu…
Diffstat (limited to 'apps')
-rw-r--r--apps/dav/lib/Connector/Sabre/File.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/dav/lib/Connector/Sabre/File.php b/apps/dav/lib/Connector/Sabre/File.php
index a1f5e2fe876..098961ce130 100644
--- a/apps/dav/lib/Connector/Sabre/File.php
+++ b/apps/dav/lib/Connector/Sabre/File.php
@@ -263,7 +263,7 @@ class File extends Node implements IFile {
try {
$this->acquireLock(ILockingProvider::LOCK_EXCLUSIVE);
- } catch (LockedException $e) {
+ } catch (LockedException $ex) {
if ($needsPartFile) {
$partStorage->unlink($internalPartPath);
}