Skip to content

Commit 4cd952e

Browse files
committed
fix: execute throws docrine exceptions not our wrapped ones
Signed-off-by: Julius Härtl <jus@bitgrid.net>
1 parent 74b4fd2 commit 4cd952e

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

lib/private/Files/Cache/Updater.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
*/
2828
namespace OC\Files\Cache;
2929

30+
use Doctrine\DBAL\Exception\DeadlockException;
3031
use OC\DB\Exceptions\DbalException;
3132
use OC\Files\FileInfo;
3233
use OCP\Files\Cache\ICacheEntry;
@@ -260,7 +261,7 @@ private function correctParentStorageMtime($internalPath) {
260261
if ($mtime !== false) {
261262
try {
262263
$this->cache->update($parentId, ['storage_mtime' => $mtime]);
263-
} catch (DbalException $e) {
264+
} catch (DeadlockException $e) {
264265
// ignore the failure.
265266
// with failures concurrent updates, someone else would have already done it.
266267
// in the worst case the `storage_mtime` isn't updated, which should at most only trigger an extra rescan

lib/public/DB/QueryBuilder/IQueryBuilder.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ public function getState();
165165
* to bridge old code to the new API
166166
*
167167
* @return IResult|int
168-
* @throws Exception since 21.0.0
168+
* @throws \Doctrine\DBAL\Exception since 21.0.0
169169
* @since 8.2.0
170170
* @deprecated 22.0.0 Use executeQuery or executeStatement
171171
*/

0 commit comments

Comments
 (0)