mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Do not set callback wrapper when locking is disabled

This commit is contained in:
Vincent Petry 2015-06-30 13:45:41 +02:00
parent a1bfc26b88
commit afd83caf69
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/private/files/view.php
View File

@ -79,6 +79,8 @@ class View {
*/ */
private $lockingProvider; private $lockingProvider;
private $lockingEnabled;
/** /**
* @param string $root * @param string $root
* @throws \Exception If $root contains an invalid path * @throws \Exception If $root contains an invalid path
@ -94,6 +96,7 @@ class View {
$this->fakeRoot = $root; $this->fakeRoot = $root;
$this->updater = new Updater($this); $this->updater = new Updater($this);
$this->lockingProvider = \OC::$server->getLockingProvider(); $this->lockingProvider = \OC::$server->getLockingProvider();
$this->lockingEnabled = !($this->lockingProvider instanceof \OC\Lock\NoopLockingProvider);
} }
public function getAbsolutePath($path = '/') { public function getAbsolutePath($path = '/') {
@ -1021,7 +1024,7 @@ class View {
} }
$unlockLater = false; $unlockLater = false;
if ($operation === 'fopen' and is_resource($result)) { if ($this->lockingEnabled && $operation === 'fopen' && is_resource($result)) {
$unlockLater = true; $unlockLater = true;
$result = CallbackWrapper::wrap($result, null, null, function () use ($hooks, $path) { $result = CallbackWrapper::wrap($result, null, null, function () use ($hooks, $path) {
if (in_array('write', $hooks)) { if (in_array('write', $hooks)) {