Merge pull request #19746 from nextcloud/locked-exception-forward-exi…

…sting pass the existing locks info when making locked exception with absolu…
nextcloud · Mar 9, 2020 · b6245be · b6245be
2 parents 1f7cb02 + fab22ac
commit b6245be
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 5 deletions.
diff --git a/apps/dav/lib/Connector/Sabre/File.php b/apps/dav/lib/Connector/Sabre/File.php
@@ -263,7 +263,7 @@ public function put($data) {
 
 					try {
 						$this->acquireLock(ILockingProvider::LOCK_EXCLUSIVE);
-					} catch (LockedException $e) {
+					} catch (LockedException $ex) {
 						if ($needsPartFile) {
 							$partStorage->unlink($internalPartPath);
 						}

diff --git a/lib/private/Files/View.php b/lib/private/Files/View.php
@@ -1946,7 +1946,8 @@ private function lockPath($path, $type, $lockMountPoint = false) {
 				// rethrow with the a human-readable path
 				throw new LockedException(
 					$this->getPathRelativeToFiles($absolutePath),
-					$e
+					$e,
+					$e->getExistingLock()
 				);
 			}
 		}
@@ -1988,12 +1989,14 @@ public function changeLock($path, $type, $lockMountPoint = false) {
 					// 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()
 					);
 				}
 			}

diff --git a/lib/public/Lock/LockedException.php b/lib/public/Lock/LockedException.php
@@ -44,6 +44,9 @@ class LockedException extends \Exception {
 	 */
 	private $path;
 
+	/** @var string|null */
+	private $existingLock;
+
 	/**
 	 * LockedException constructor.
 	 *
@@ -54,6 +57,7 @@ class LockedException extends \Exception {
 	 */
 	public function __construct(string $path, \Exception $previous = null, string $existingLock = null) {
 		$message = '"' . $path . '" is locked';
+		$this->existingLock = $existingLock;
 		if ($existingLock) {
 			$message .= ', existing lock on file: ' . $existingLock;
 		}
@@ -68,4 +72,12 @@ public function __construct(string $path, \Exception $previous = null, string $e
 	public function getPath(): string {
 		return $this->path;
 	}
+
+	/**
+	 * @return string
+	 * @since 19.0.0
+	 */
+	public function getExistingLock(): ?string {
+		return $this->existingLock;
+	}
 }