Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoeland Jago Douma <roeland@famdouma.nl>2018-10-16 11:57:37 +0300
committerRoeland Jago Douma <roeland@famdouma.nl>2018-10-29 17:12:47 +0300
commit8d3220a4aad56a6c85bf9053f1c5a1fb38c57147 (patch)
treea1fe6e6c6fc50daa902278407feb2a0c7168b412 /apps/files_sharing
parent48b57d1284ead63c65b387a77003a0415668a393 (diff)
Double check for failed cache with a shared storage
When obtaining the SourceRootInfo we can call init. If this fails the cache is set to a failed cache and the storage to a failed storage. However we did not check for this. Which means that if the storage was invalid it would fail later on. Now we will properly error out. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Diffstat (limited to 'apps/files_sharing')
-rw-r--r--apps/files_sharing/lib/SharedStorage.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/apps/files_sharing/lib/SharedStorage.php b/apps/files_sharing/lib/SharedStorage.php
index 34a21fcd637..f9c4a85fac6 100644
--- a/apps/files_sharing/lib/SharedStorage.php
+++ b/apps/files_sharing/lib/SharedStorage.php
@@ -378,10 +378,12 @@ class SharedStorage extends \OC\Files\Storage\Wrapper\Jail implements ISharedSto
if (!$storage) {
$storage = $this;
}
+ $sourceRoot = $this->getSourceRootInfo();
if ($this->storage instanceof FailedStorage) {
return new FailedCache();
}
- $this->cache = new \OCA\Files_Sharing\Cache($storage, $this->getSourceRootInfo(), $this->superShare);
+
+ $this->cache = new \OCA\Files_Sharing\Cache($storage, $sourceRoot, $this->superShare);
return $this->cache;
}