From 64864bf654208fe5b8fffcba3985c46fac657127 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Wed, 24 May 2017 13:56:09 +0200 Subject: [PATCH] dont die if we try to access the shared cache while setting up the shared storage Signed-off-by: Robin Appelman --- apps/files_sharing/lib/Cache.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) 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; } -- 2.39.5