Merge pull request #290 from nextcloud/backport/288/stable28

[stable28] fix: Only update lock timeout when it is not infinite
nextcloud · Apr 16, 2024 · f014114 · f014114
2 parents 34a11b4 + 7366f54
commit f014114
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/Service/LockService.php b/lib/Service/LockService.php
@@ -169,7 +169,7 @@ public function lock(LockContext $lockScope): FileLock {
 				$known->getType() === $lockScope->getType() && ($known->getOwner() === $lockScope->getOwner() || $known->getToken() === $lockScope->getOwner())
 			) {
 				$known->setTimeout(
-					$known->getTimeout() - $known->getETA() + $this->configService->getTimeoutSeconds()
+					$known->getETA() !== FileLock::ETA_INFINITE ? $known->getTimeout() - $known->getETA() + $this->configService->getTimeoutSeconds() : 0
 				);
 				$this->notice('extending existing lock', false, ['fileLock' => $known]);
 				$this->locksRequest->update($known);