summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2016-08-24 09:25:29 +0200
committerGitHub <noreply@github.com>2016-08-24 09:25:29 +0200
commit8d8366762be728f10af7ae9e465dcdba727d0eaf (patch)
treed3fc5d80a42c18e313f4f3a8a65fd843ae7d987d
parent2f1b17d44a854221a4b3c461df80d0522ac3c8b5 (diff)
parent352d22e47306d5b039f1975417b226414c80ccbc (diff)
downloadnextcloud-server-8d8366762be728f10af7ae9e465dcdba727d0eaf.tar.gz
nextcloud-server-8d8366762be728f10af7ae9e465dcdba727d0eaf.zip
Merge pull request #1030 from nextcloud/master_1013
[master] Do not error on NotFoundException
-rw-r--r--apps/files_sharing/lib/sharedstorage.php4
1 files changed, 4 insertions, 0 deletions
diff --git a/apps/files_sharing/lib/sharedstorage.php b/apps/files_sharing/lib/sharedstorage.php
index 6dec020982e..3ceca430424 100644
--- a/apps/files_sharing/lib/sharedstorage.php
+++ b/apps/files_sharing/lib/sharedstorage.php
@@ -36,6 +36,7 @@ use OC\Files\Cache\FailedCache;
use OCA\Files_Sharing\ISharedStorage;
use OCP\Constants;
use OCP\Files\Cache\ICacheEntry;
+use OCP\Files\NotFoundException;
use OCP\Files\Storage\IStorage;
use OCP\Lock\ILockingProvider;
@@ -94,6 +95,9 @@ class Shared extends \OC\Files\Storage\Wrapper\Jail implements ISharedStorage {
$sourcePath = $this->ownerView->getPath($this->superShare->getNodeId());
list($this->storage, $this->rootPath) = $this->ownerView->resolvePath($sourcePath);
$this->sourceRootInfo = $this->storage->getCache()->get($this->rootPath);
+ } catch (NotFoundException $e) {
+ $this->storage = new FailedStorage(['exception' => $e]);
+ $this->rootPath = '';
} catch (\Exception $e) {
$this->storage = new FailedStorage(['exception' => $e]);
$this->rootPath = '';