[Pkg-owncloud-commits] [owncloud] 33/205: unlock the file if the file doesnt exists

[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 6018567df2bc0c5f7cd50b8e27d054d0184a56a5
Author: Robin Appelman <icewind at owncloud.com>
Date:   Thu Jun 18 14:49:31 2015 +0200

    unlock the file if the file doesnt exists
---
 lib/private/files/view.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/private/files/view.php b/lib/private/files/view.php
index 711acc0..46158b4 100644
--- a/lib/private/files/view.php
+++ b/lib/private/files/view.php
@@ -1166,6 +1166,7 @@ class View {
 				// if the file is not in the cache or needs to be updated, trigger the scanner and reload the data
 				if (!$data) {
 					if (!$storage->file_exists($internalPath)) {
+						$this->unlockFile($relativePath, ILockingProvider::LOCK_SHARED);
 						return false;
 					}
 					$scanner = $storage->getScanner($internalPath);
@@ -1251,6 +1252,7 @@ class View {
 				$watcher = $storage->getWatcher($internalPath);
 				if (!$data or $data['size'] === -1) {
 					if (!$storage->file_exists($internalPath)) {
+						$this->unlockFile($directory, ILockingProvider::LOCK_SHARED);
 						return array();
 					}
 					$scanner = $storage->getScanner($internalPath);

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