aboutsummaryrefslogtreecommitdiffstats
path: root/apps/files_sharing
diff options
context:
space:
mode:
authorRobin Appelman <robin@icewind.nl>2017-05-24 13:56:09 +0200
committerRobin Appelman <robin@icewind.nl>2017-05-24 13:56:09 +0200
commited8903404768f5957ddf39f5979741b18000f69d (patch)
tree2a823d9147ee427dad7d0c77957d6f52419315d9 /apps/files_sharing
parent6cc26efbc5329066cfd0a197023d2772311c85c0 (diff)
downloadnextcloud-server-ed8903404768f5957ddf39f5979741b18000f69d.tar.gz
nextcloud-server-ed8903404768f5957ddf39f5979741b18000f69d.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/files_sharing')
-rw-r--r--apps/files_sharing/lib/Cache.php9
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;
}