summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2019-07-16 13:34:08 +0200
committerGitHub <noreply@github.com>2019-07-16 13:34:08 +0200
commitef25d464a4c3fd8531f2d7f2fc21c157f7554a45 (patch)
treedcfbe687de58ef2cbb0de9f34f38251ecb55052f
parent988df2d2e983aeead7ae8dbe892fff3a4ff36423 (diff)
parentf7a6f4527e55c8d02ffcd8e5a8078b0560fc2e71 (diff)
downloadnextcloud-server-ef25d464a4c3fd8531f2d7f2fc21c157f7554a45.tar.gz
nextcloud-server-ef25d464a4c3fd8531f2d7f2fc21c157f7554a45.zip
Merge pull request #16414 from nextcloud/backport/15606/stable16
[stable16] Add catch for RuntimeException
-rw-r--r--lib/private/Repair/NC16/CleanupCardDAVPhotoCache.php4
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/private/Repair/NC16/CleanupCardDAVPhotoCache.php b/lib/private/Repair/NC16/CleanupCardDAVPhotoCache.php
index c9c7b5cf1c0..f0e5c2b2a1f 100644
--- a/lib/private/Repair/NC16/CleanupCardDAVPhotoCache.php
+++ b/lib/private/Repair/NC16/CleanupCardDAVPhotoCache.php
@@ -29,6 +29,7 @@ use OCP\IConfig;
use OCP\ILogger;
use OCP\Migration\IOutput;
use OCP\Migration\IRepairStep;
+use RuntimeException;
/**
* Class CleanupCardDAVPhotoCache
@@ -65,6 +66,9 @@ class CleanupCardDAVPhotoCache implements IRepairStep {
$folders = $this->appData->getDirectoryListing();
} catch (NotFoundException $e) {
return;
+ } catch (RuntimeException $e) {
+ $this->logger->logException($e, ['message' => 'Failed to fetch directory listing in CleanupCardDAVPhotoCache']);
+ return;
}
$folders = array_filter($folders, function (ISimpleFolder $folder) {