Merge pull request #6170 from nextcloud/backport/6167/stable29

lib/Listeners/BeforeNodeWrittenListener.php

@@ -31,15 +31,17 @@
 use OCP\EventDispatcher\IEventListener;
 use OCP\Files\Events\Node\BeforeNodeWrittenEvent;
 use OCP\Files\File;
+use OCP\Files\NotFoundException;
+use Psr\Log\LoggerInterface;
 
 /**
  * @template-implements IEventListener<Event|BeforeNodeWrittenEvent>
  */
 class BeforeNodeWrittenListener implements IEventListener {
-	private DocumentService $documentService;
-
-	public function __construct(DocumentService $documentService) {
-		$this->documentService = $documentService;
+	public function __construct(
+		private LoggerInterface $logger,
+		private DocumentService $documentService
+	) {
 	}
 
 	public function handle(Event $event): void {
@@ -56,8 +58,11 @@ public function handle(Event $event): void {
 		// Reset document session to avoid manual conflict resolution if there's no unsaved steps
 		try {
 			$this->documentService->resetDocument($node->getId());
-		} catch (DocumentHasUnsavedChangesException) {
+		} catch (DocumentHasUnsavedChangesException|NotFoundException $e) {
 			// Do not throw during event handling in this is expected to happen
+			// DocumentHasUnsavedChangesException: A document editing session is likely ongoing, someone can resolve the conflict
+			// NotFoundException: The event was called oin a file that was just created so a NonExistingFile object is used that has no id yet
+			$this->logger->debug('Reset document skipped in BeforeNodeWrittenEvent', ['exception' => $e]);
 		}
 	}
 }