wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Always unlock node after trying to create a share

Browse source 
Signed-off-by: Robin Appelman <robin@icewind.nl>
This commit is contained in:
Robin Appelman 2016-09-20 11:29:12 +02:00
parent 0d842e0550
commit 37eded7e7c
No known key found for this signature in database
GPG key ID: 425003AC385454C5
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/files_sharing/lib/API/Share20OCS.php
View file

@ -402,8 +402,10 @@ class Share20OCS extends OCSController {
} catch (GenericShareException $e) {
$code = $e->getCode() === 0 ? 403 : $e->getCode();
throw new OCSException($e->getHint(), $code);
}catch (\Exception $e) {
} catch (\Exception $e) {
throw new OCSForbiddenException($e->getMessage());
} finally {
$share->getNode()->unlock(ILockingProvider::LOCK_SHARED);
}
$output = $this->formatShare($share);

2
lib/private/Share20/Share.php
View file

@ -160,7 +160,7 @@ class Share implements \OCP\Share\IShare {
$nodes = $userFolder->getById($this->fileId);
if (empty($nodes)) {
throw new NotFoundException();
throw new NotFoundException('Node for share not found, fileid: ' . $this->fileId);
}
$this->node = $nodes[0];