diff options
author | Robin Appelman <icewind@owncloud.com> | 2016-01-04 14:11:21 +0100 |
---|---|---|
committer | Robin Appelman <icewind@owncloud.com> | 2016-01-14 13:01:43 +0100 |
commit | bdf51d9ea4a3fb3e6b0e3d019ed06ca0d9cb3d3a (patch) | |
tree | d2d348f89c1de9a26124e861912777ad3bd1f2bc /lib/private/files/cache | |
parent | 0724ac1e5ed83926ed9cbbb8c660b40ef1254da8 (diff) | |
download | nextcloud-server-bdf51d9ea4a3fb3e6b0e3d019ed06ca0d9cb3d3a.tar.gz nextcloud-server-bdf51d9ea4a3fb3e6b0e3d019ed06ca0d9cb3d3a.zip |
only trigger locking on lockingstorages
Diffstat (limited to 'lib/private/files/cache')
-rw-r--r-- | lib/private/files/cache/scanner.php | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/lib/private/files/cache/scanner.php b/lib/private/files/cache/scanner.php index 92151149374..743b50f54a9 100644 --- a/lib/private/files/cache/scanner.php +++ b/lib/private/files/cache/scanner.php @@ -38,6 +38,7 @@ use OC\Files\Filesystem; use OC\Hooks\BasicEmitter; use OCP\Config; use OCP\Files\Cache\IScanner; +use OCP\Files\Storage\ILockingStorage; use OCP\Lock\ILockingProvider; /** @@ -132,7 +133,9 @@ class Scanner extends BasicEmitter implements IScanner { and !Filesystem::isFileBlacklisted($file) ) { if ($lock) { - $this->storage->acquireLock($file, ILockingProvider::LOCK_SHARED, $this->lockingProvider); + if ($this->storage->instanceOfStorage('\OCP\Files\Storage\ILockingStorage')) { + $this->storage->acquireLock($file, ILockingProvider::LOCK_SHARED, $this->lockingProvider); + } } $this->emit('\OC\Files\Cache\Scanner', 'scanFile', array($file, $this->storageId)); \OC_Hook::emit('\OC\Files\Cache\Scanner', 'scan_file', array('path' => $file, 'storage' => $this->storageId)); @@ -192,7 +195,9 @@ class Scanner extends BasicEmitter implements IScanner { $this->removeFromCache($file); } if ($lock) { - $this->storage->releaseLock($file, ILockingProvider::LOCK_SHARED, $this->lockingProvider); + if ($this->storage->instanceOfStorage('\OCP\Files\Storage\ILockingStorage')) { + $this->storage->releaseLock($file, ILockingProvider::LOCK_SHARED, $this->lockingProvider); + } } return $data; } @@ -259,7 +264,9 @@ class Scanner extends BasicEmitter implements IScanner { $reuse = ($recursive === self::SCAN_SHALLOW) ? self::REUSE_ETAG | self::REUSE_SIZE : self::REUSE_ETAG; } if ($lock) { - $this->storage->acquireLock($path, ILockingProvider::LOCK_SHARED, $this->lockingProvider); + if ($this->storage->instanceOfStorage('\OCP\Files\Storage\ILockingStorage')) { + $this->storage->acquireLock($path, ILockingProvider::LOCK_SHARED, $this->lockingProvider); + } } $data = $this->scanFile($path, $reuse, -1, null, $lock); if ($data and $data['mimetype'] === 'httpd/unix-directory') { @@ -267,7 +274,9 @@ class Scanner extends BasicEmitter implements IScanner { $data['size'] = $size; } if ($lock) { - $this->storage->releaseLock($path, ILockingProvider::LOCK_SHARED, $this->lockingProvider); + if ($this->storage->instanceOfStorage('\OCP\Files\Storage\ILockingStorage')) { + $this->storage->releaseLock($path, ILockingProvider::LOCK_SHARED, $this->lockingProvider); + } } return $data; } |