From c208ea49d41256822f3ed63765e949f34f056530 Mon Sep 17 00:00:00 2001 From: Daniel Kesselberg Date: Fri, 17 May 2019 21:04:01 +0200 Subject: [PATCH] Add catch for RuntimeException getDirectoryListing can throw a NotFoundException or a RuntimeException. The repair step should be skipped if the cache directory is missing so a catch for both exceptions is required. Signed-off-by: Daniel Kesselberg --- lib/private/Repair/NC16/CleanupCardDAVPhotoCache.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/private/Repair/NC16/CleanupCardDAVPhotoCache.php b/lib/private/Repair/NC16/CleanupCardDAVPhotoCache.php index c9c7b5cf1c..92ffcb5474 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 @@ -63,7 +64,7 @@ class CleanupCardDAVPhotoCache implements IRepairStep { private function repair(IOutput $output): void { try { $folders = $this->appData->getDirectoryListing(); - } catch (NotFoundException $e) { + } catch (NotFoundException|RuntimeException $e) { return; }