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

Merge pull request #8229 from nextcloud/dav-dir-exception-previous-12 

[12] keep previous exception when transforming to dav exception
This commit is contained in:
Joas Schilling 2018-02-07 17:07:47 +01:00 committed by GitHub
parent e2fddd29d1 dbc99e47ef
commit c1165f6037
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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);
return $node->put($data);
} 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) {
throw new InvalidPath($ex->getMessage());
throw new InvalidPath($ex->getMessage(), false, $ex);
} catch (ForbiddenException $ex) {
throw new Forbidden($ex->getMessage(), $ex->getRetry());
throw new Forbidden($ex->getMessage(), $ex->getRetry(), $ex);
} catch (LockedException $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 bool $retry
* @param \Exception|null $previous
*/
public function __construct($message, $retry = false) {
parent::__construct($message);
public function __construct($message, $retry = false, \Exception $previous = null) {
parent::__construct($message, 0, $previous);
$this->retry = $retry;
}