release locks in case of exception
This commit is contained in:
parent
def8e0c12a
commit
3bf818450a
|
@ -175,11 +175,13 @@ class OC_Files {
|
||||||
}
|
}
|
||||||
self::unlockAllTheFiles($dir, $files, $getType, $view, $filename);
|
self::unlockAllTheFiles($dir, $files, $getType, $view, $filename);
|
||||||
} catch (\OCP\Lock\LockedException $ex) {
|
} catch (\OCP\Lock\LockedException $ex) {
|
||||||
|
self::unlockAllTheFiles($dir, $files, $getType, $view, $filename);
|
||||||
OC::$server->getLogger()->logException($ex);
|
OC::$server->getLogger()->logException($ex);
|
||||||
$l = \OC::$server->getL10N('core');
|
$l = \OC::$server->getL10N('core');
|
||||||
$hint = method_exists($ex, 'getHint') ? $ex->getHint() : '';
|
$hint = method_exists($ex, 'getHint') ? $ex->getHint() : '';
|
||||||
\OC_Template::printErrorPage($l->t('File is currently busy, please try again later'), $hint);
|
\OC_Template::printErrorPage($l->t('File is currently busy, please try again later'), $hint);
|
||||||
} catch (\Exception $ex) {
|
} catch (\Exception $ex) {
|
||||||
|
self::unlockAllTheFiles($dir, $files, $getType, $view, $filename);
|
||||||
OC::$server->getLogger()->logException($ex);
|
OC::$server->getLogger()->logException($ex);
|
||||||
$l = \OC::$server->getL10N('core');
|
$l = \OC::$server->getL10N('core');
|
||||||
$hint = method_exists($ex, 'getHint') ? $ex->getHint() : '';
|
$hint = method_exists($ex, 'getHint') ? $ex->getHint() : '';
|
||||||
|
|
Loading…
Reference in New Issue