sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

dont die if we try to access the shared cache while setting up the shared storage 

Signed-off-by: Robin Appelman <robin@icewind.nl>
pull/5463/head
Robin Appelman 2017-05-24 13:56:09 +07:00
parent e76081e858
commit cbabc568db
No known key found for this signature in database
GPG Key ID: CBCA68FBAEBF98C9
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
apps/files_sharing/lib/Cache.php
Unescape Escape View File

@ -27,6 +27,7 @@
namespace OCA\Files_Sharing;
use OC\Files\Cache\FailedCache;
use OC\Files\Cache\Wrapper\CacheJail;
use OCP\Files\Cache\ICacheEntry;
@ -68,7 +69,13 @@ class Cache extends CacheJail {
public function getCache() {
if (is_null($this->cache)) {
$this->cache = $this->storage->getSourceStorage()->getCache();
$sourceStorage = $this->storage->getSourceStorage();
if ($sourceStorage) {
$this->cache = $sourceStorage->getCache();
} else {
// don't set $this->cache here since sourceStorage will be set later
return new FailedCache();
}
}
return $this->cache;
}