mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1029 from nextcloud/stable10_1013 

[Stable10] Do not error on NotFoundException
This commit is contained in:
Roeland Jago Douma 2016-08-24 09:30:27 +02:00 committed by GitHub
parent 2ca5186c94 4528bdabe7
commit 95fb14f5b0
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/files_sharing/lib/sharedstorage.php
View File

@ -36,6 +36,7 @@ use OC\Files\Cache\FailedCache;
use OCA\Files_Sharing\ISharedStorage; use OCA\Files_Sharing\ISharedStorage;
use OCP\Constants; use OCP\Constants;
use OCP\Files\Cache\ICacheEntry; use OCP\Files\Cache\ICacheEntry;
use OCP\Files\NotFoundException;
use OCP\Files\Storage\IStorage; use OCP\Files\Storage\IStorage;
use OCP\Lock\ILockingProvider; 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()); $sourcePath = $this->ownerView->getPath($this->superShare->getNodeId());
list($this->storage, $this->rootPath) = $this->ownerView->resolvePath($sourcePath); list($this->storage, $this->rootPath) = $this->ownerView->resolvePath($sourcePath);
$this->sourceRootInfo = $this->storage->getCache()->get($this->rootPath); $this->sourceRootInfo = $this->storage->getCache()->get($this->rootPath);
} catch (NotFoundException $e) {
$this->storage = new FailedStorage(['exception' => $e]);
$this->rootPath = '';
} catch (\Exception $e) { } catch (\Exception $e) {
$this->storage = new FailedStorage(['exception' => $e]); $this->storage = new FailedStorage(['exception' => $e]);
$this->rootPath = ''; $this->rootPath = '';