[Pkg-owncloud-commits] [owncloud] 207/457: fix unlocking when moving mount points

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch stable8
in repository owncloud.

commit a1a25a9b5bddab05b6e8250557e8b7b6e17da1ff
Author: Robin Appelman <icewind at owncloud.com>
Date:   Mon May 11 13:36:25 2015 +0200

    fix unlocking when moving mount points
---
 lib/private/files/view.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/private/files/view.php b/lib/private/files/view.php
index eb6fd0b..9540a2e 100644
--- a/lib/private/files/view.php
+++ b/lib/private/files/view.php
@@ -664,6 +664,11 @@ class View {
 				$this->unlockFile($path1, ILockingProvider::LOCK_EXCLUSIVE);
 				$this->unlockFile($path2, ILockingProvider::LOCK_EXCLUSIVE);
 
+				if ($internalPath1 === '' and $mount1 instanceof MoveableMount) {
+					// since $path2 now points to a different storage we need to unlock the path on the old storage separately
+					$storage2->releaseLock($internalPath2, ILockingProvider::LOCK_EXCLUSIVE, $this->lockingProvider);
+				}
+
 				if ((Cache\Scanner::isPartialFile($path1) && !Cache\Scanner::isPartialFile($path2)) && $result !== false) {
 					// if it was a rename from a part file to a regular file it was a write and not a rename operation
 					$this->updater->update($path2);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git