summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorJulius Härtl <jus@bitgrid.net>2023-05-13 13:11:37 +0200
committerGitHub <noreply@github.com>2023-05-13 13:11:37 +0200
commit8cab1d73ac5c153679b7d1b4b450fc05e99a3135 (patch)
treea7d6f07a0f9dcf91e521aaf4552f27078884ccb2 /lib
parent7ba6323db58154f35c9d71c983729d0cbc49742a (diff)
parent11c5bc6a2ac1f9febce3c9e7183e5a444d490d52 (diff)
downloadnextcloud-server-8cab1d73ac5c153679b7d1b4b450fc05e99a3135.tar.gz
nextcloud-server-8cab1d73ac5c153679b7d1b4b450fc05e99a3135.zip
Merge pull request #37621 from nextcloud/enh/lock-readable-path
Diffstat (limited to 'lib')
-rw-r--r--lib/private/Files/Storage/Common.php3
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/private/Files/Storage/Common.php b/lib/private/Files/Storage/Common.php
index abbcf4ea433..cd9a05a2a1d 100644
--- a/lib/private/Files/Storage/Common.php
+++ b/lib/private/Files/Storage/Common.php
@@ -764,6 +764,7 @@ abstract class Common implements Storage, ILockingStorage, IWriteStreamStorage {
try {
$provider->acquireLock('files/' . md5($this->getId() . '::' . trim($path, '/')), $type, $this->getId() . '::' . $path);
} catch (LockedException $e) {
+ $e = new LockedException($e->getPath(), $e, $e->getExistingLock(), $path);
if ($logger) {
$logger->info($e->getMessage(), ['exception' => $e]);
}
@@ -796,6 +797,7 @@ abstract class Common implements Storage, ILockingStorage, IWriteStreamStorage {
try {
$provider->releaseLock('files/' . md5($this->getId() . '::' . trim($path, '/')), $type);
} catch (LockedException $e) {
+ $e = new LockedException($e->getPath(), $e, $e->getExistingLock(), $path);
if ($logger) {
$logger->info($e->getMessage(), ['exception' => $e]);
}
@@ -828,6 +830,7 @@ abstract class Common implements Storage, ILockingStorage, IWriteStreamStorage {
try {
$provider->changeLock('files/' . md5($this->getId() . '::' . trim($path, '/')), $type);
} catch (LockedException $e) {
+ $e = new LockedException($e->getPath(), $e, $e->getExistingLock(), $path);
if ($logger) {
$logger->info($e->getMessage(), ['exception' => $e]);
}