From fab22ac14cb8116006b11cb2bcfe0337daaa2138 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Mon, 2 Mar 2020 17:47:48 +0100 Subject: pass the existing locks info when making locked exception with absolute paths Signed-off-by: Robin Appelman --- lib/private/Files/View.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'lib/private') 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() ); } } -- cgit v1.2.3