mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

keep previous exception when transforming to dav exception 

Signed-off-by: Robin Appelman <robin@icewind.nl>
This commit is contained in:
Robin Appelman 2018-02-07 13:34:30 +01:00
parent f8740a1f0c
commit 38cb28db1f
No known key found for this signature in database
GPG Key ID: 42B69D8A64526EFB
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/dav/lib/Connector/Sabre/Directory.php
View File

@ -150,11 +150,11 @@ class Directory extends \OCA\DAV\Connector\Sabre\Node
$node->acquireLock(ILockingProvider::LOCK_SHARED); $node->acquireLock(ILockingProvider::LOCK_SHARED);
return $node->put($data); return $node->put($data);
} catch (\OCP\Files\StorageNotAvailableException $e) { } catch (\OCP\Files\StorageNotAvailableException $e) {
throw new \Sabre\DAV\Exception\ServiceUnavailable($e->getMessage()); throw new \Sabre\DAV\Exception\ServiceUnavailable($e->getMessage(), $e->getCode(), $e);
} catch (InvalidPathException $ex) { } catch (InvalidPathException $ex) {
throw new InvalidPath($ex->getMessage()); throw new InvalidPath($ex->getMessage(), false, $ex);
} catch (ForbiddenException $ex) { } catch (ForbiddenException $ex) {
throw new Forbidden($ex->getMessage(), $ex->getRetry()); throw new Forbidden($ex->getMessage(), $ex->getRetry(), $ex);
} catch (LockedException $e) { } catch (LockedException $e) {
throw new FileLocked($e->getMessage(), $e->getCode(), $e); throw new FileLocked($e->getMessage(), $e->getCode(), $e);
} }

5
apps/dav/lib/Connector/Sabre/Exception/InvalidPath.php
View File

@ -36,9 +36,10 @@ class InvalidPath extends Exception {
/** /**
* @param string $message * @param string $message
* @param bool $retry * @param bool $retry
* @param \Exception|null $previous
*/ */
public function __construct($message, $retry = false) { public function __construct($message, $retry = false, \Exception $previous = null) {
parent::__construct($message); parent::__construct($message, 0, $previous);
$this->retry = $retry; $this->retry = $retry;
} }