Merge pull request #5175 from nextcloud/fix/wrap-classifier-exceptions-and-remove-throwable

Wrap Exceptions in ServiceException and remove Throwable exception

1 files changed, 6 insertions, 1 deletions

diff --git a/lib/Service/Classification/PersistenceService.php b/lib/Service/Classification/PersistenceService.php
index 5d364f451..b9ba94fa1 100644
--- a/lib/Service/Classification/PersistenceService.php
+++ b/lib/Service/Classification/PersistenceService.php
@@ -183,7 +183,12 @@ class PersistenceService {
 				throw new ServiceException("Could not load classifier $id: " . $e->getMessage(), 0, $e);
 			}
 
-			$serialized = $modelFile->getContent();
+			try {
+				$serialized = $modelFile->getContent();
+			} catch (NotFoundException | NotPermittedException $e) {
+				$this->logger->debug("Could not load content for model file with classifier id $id: " . $e->getMessage());
+				throw new ServiceException("Could not load content for model file with classifier id $id: " . $e->getMessage(), 0, $e);
+			}
 			$size = strlen($serialized);
 			$this->logger->debug("Serialized classifier loaded (size=$size)");