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>

diff --git a/apps/files_sharing/lib/SharedStorage.php b/apps/files_sharing/lib/SharedStorage.php
index 34a21fcd637499305753d2151ae2cbe6a1a29176..f9c4a85fac6ac596ceefc5bd4ac3a106b494eb2e 100644 (file)
--- 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;
        }