Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Nextcloud
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Monitor
Service Desk
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
TeDomum
Nextcloud
Commits
9d6d23d1
Unverified
Commit
9d6d23d1
authored
7 years ago
by
Robin Appelman
Browse files
Options
Downloads
Patches
Plain Diff
keep previous exception when transforming to dav exception
Signed-off-by:
Robin Appelman
<
robin@icewind.nl
>
parent
3063131e
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
apps/dav/lib/Connector/Sabre/Directory.php
+3
-3
3 additions, 3 deletions
apps/dav/lib/Connector/Sabre/Directory.php
apps/dav/lib/Connector/Sabre/Exception/InvalidPath.php
+3
-2
3 additions, 2 deletions
apps/dav/lib/Connector/Sabre/Exception/InvalidPath.php
with
6 additions
and
5 deletions
apps/dav/lib/Connector/Sabre/Directory.php
+
3
−
3
View file @
9d6d23d1
...
@@ -150,11 +150,11 @@ class Directory extends \OCA\DAV\Connector\Sabre\Node
...
@@ -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
);
}
}
...
...
This diff is collapsed.
Click to expand it.
apps/dav/lib/Connector/Sabre/Exception/InvalidPath.php
+
3
−
2
View file @
9d6d23d1
...
@@ -36,9 +36,10 @@ class InvalidPath extends Exception {
...
@@ -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
;
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment