upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-12 18:21:40 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 21

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

Browse source 
Revent accidental push

This reverts commit ed89034047.
This commit is contained in:
Robin Appelman 2017-06-19 14:00:27 +02:00
parent 64864bf654
commit e76081e858
No known key found for this signature in database
GPG key ID: CBCA68FBAEBF98C9
1 changed files with 1 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
apps/files_sharing/lib/Cache.php
View file

@ -27,7 +27,6 @@
namespace OCA\Files_Sharing;
use OC\Files\Cache\FailedCache;
use OC\Files\Cache\Wrapper\CacheJail;
use OCP\Files\Cache\ICacheEntry;
@ -69,13 +68,7 @@ class Cache extends CacheJail {
public function getCache() {
if (is_null($this->cache)) {
$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();
}
$this->cache = $this->storage->getSourceStorage()->getCache();
}
return $this->cache;
}