diff options
author | Robin Appelman <robin@icewind.nl> | 2017-05-24 13:56:09 +0200 |
---|---|---|
committer | Robin Appelman <robin@icewind.nl> | 2017-06-19 13:58:30 +0200 |
commit | 64864bf654208fe5b8fffcba3985c46fac657127 (patch) | |
tree | 849521c086597d797827eb43db01b4595b6ccf06 /apps | |
parent | deaa8b68851729b75067de7520cfc760c452aa39 (diff) | |
download | nextcloud-server-64864bf654208fe5b8fffcba3985c46fac657127.tar.gz nextcloud-server-64864bf654208fe5b8fffcba3985c46fac657127.zip |
dont die if we try to access the shared cache while setting up the shared storage
Signed-off-by: Robin Appelman <robin@icewind.nl>
Diffstat (limited to 'apps')
-rw-r--r-- | apps/files_sharing/lib/Cache.php | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/apps/files_sharing/lib/Cache.php b/apps/files_sharing/lib/Cache.php index d9cf5d80b80..1c311935bb6 100644 --- a/apps/files_sharing/lib/Cache.php +++ b/apps/files_sharing/lib/Cache.php @@ -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; } |