From 167f57c15e8d073506810a6c3b3cbc18f0b84c0c Mon Sep 17 00:00:00 2001 From: Vincent Petry Date: Mon, 29 Jun 2015 16:45:08 +0200 Subject: Unlock first path on rename if second path is locked --- lib/private/files/view.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/private/files/view.php b/lib/private/files/view.php index 0c3bc54a41d..f2df2eb0f69 100644 --- a/lib/private/files/view.php +++ b/lib/private/files/view.php @@ -631,7 +631,12 @@ class View { } $this->lockFile($path1, ILockingProvider::LOCK_SHARED, true); - $this->lockFile($path2, ILockingProvider::LOCK_SHARED, true); + try { + $this->lockFile($path2, ILockingProvider::LOCK_SHARED, true); + } catch (LockedException $e) { + $this->unlockFile($path1, ILockingProvider::LOCK_SHARED); + throw $e; + } $run = true; if ($this->shouldEmitHooks() && (Cache\Scanner::isPartialFile($path1) && !Cache\Scanner::isPartialFile($path2))) { -- cgit v1.2.3