From b693487d64f088969e94ade99cfab8bd3dd7d6b0 Mon Sep 17 00:00:00 2001
From: Daniel Kesselberg <mail@danielkesselberg.de>
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 <mail@danielkesselberg.de>
---
 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 c9c7b5cf1c0..92ffcb54742 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;
 		}
 
-- 
GitLab