diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-10-02 17:42:18 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-10-05 16:53:57 +0200 |
| commit | 3bf818450a826d296b8e56ab41f91b3f9f8112f1 (patch) | |
| tree | 87060e4cef6458dc7d085f34dacf1c235e70ccd0 /lib | |
| parent | def8e0c12a263e16ec7245c5be47b6aed10f7a78 (diff) | |
| download | nextcloud-server-3bf818450a826d296b8e56ab41f91b3f9f8112f1.tar.gz nextcloud-server-3bf818450a826d296b8e56ab41f91b3f9f8112f1.zip | |
release locks in case of exception
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/files.php | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/private/files.php b/lib/private/files.php index 4783a617065..af3a8ac574d 100644 --- a/lib/private/files.php +++ b/lib/private/files.php @@ -175,11 +175,13 @@ class OC_Files { } self::unlockAllTheFiles($dir, $files, $getType, $view, $filename); } catch (\OCP\Lock\LockedException $ex) { + self::unlockAllTheFiles($dir, $files, $getType, $view, $filename); OC::$server->getLogger()->logException($ex); $l = \OC::$server->getL10N('core'); $hint = method_exists($ex, 'getHint') ? $ex->getHint() : ''; \OC_Template::printErrorPage($l->t('File is currently busy, please try again later'), $hint); } catch (\Exception $ex) { + self::unlockAllTheFiles($dir, $files, $getType, $view, $filename); OC::$server->getLogger()->logException($ex); $l = \OC::$server->getL10N('core'); $hint = method_exists($ex, 'getHint') ? $ex->getHint() : ''; |