Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin Appelman <robin@icewind.nl>2020-03-02 19:47:48 +0300
committerRobin Appelman <robin@icewind.nl>2020-03-02 21:29:44 +0300
commitfab22ac14cb8116006b11cb2bcfe0337daaa2138 (patch)
treecbee43b264dbd6c783b6be75b4a401c5922c2350 /lib/private/Files/View.php
parent64a29d01a492db19289833ba9f485b7dca881cef (diff)
pass the existing locks info when making locked exception with absolute paths
Signed-off-by: Robin Appelman <robin@icewind.nl>
Diffstat (limited to 'lib/private/Files/View.php')
-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()
);
}
}