aboutsummaryrefslogtreecommitdiffstats
path: root/lib/private
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 /lib/private
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 'lib/private')
-rw-r--r--lib/private/Files/View.php11
1 files changed, 7 insertions, 4 deletions
diff --git a/lib/private/Files/View.php b/lib/private/Files/View.php
index 2c01c112ad4..90ac1e1988d 100644
--- a/lib/private/Files/View.php
+++ b/lib/private/Files/View.php
@@ -1946,7 +1946,8 @@ class View {
// rethrow with the a human-readable path
throw new LockedException(
$this->getPathRelativeToFiles($absolutePath),
- $e
+ $e,
+ $e->getExistingLock()
);
}
}
@@ -1988,12 +1989,14 @@ class View {
// rethrow with the a human-readable path
throw new LockedException(
$this->getPathRelativeToFiles($absolutePath),
- $e
+ $e,
+ $e->getExistingLock()
);
- } catch (\InvalidArgumentException $e) {
+ } catch (\InvalidArgumentException $ex) {
throw new LockedException(
$absolutePath,
- $e
+ $ex,
+ $e->getExistingLock()
);
}
}