From e76081e858b830e783d854735cdd2f57877dafd0 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Mon, 19 Jun 2017 14:00:27 +0200 Subject: [PATCH] Revert "dont die if we try to access the shared cache while setting up the shared storage" Revent accidental push This reverts commit ed8903404768f5957ddf39f5979741b18000f69d. --- apps/files_sharing/lib/Cache.php | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/apps/files_sharing/lib/Cache.php b/apps/files_sharing/lib/Cache.php index 1c311935bb6..d9cf5d80b80 100644 --- a/apps/files_sharing/lib/Cache.php +++ b/apps/files_sharing/lib/Cache.php @@ -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; } -- 2.39.5