diff options
author | Morris Jobke <hey@morrisjobke.de> | 2015-03-24 14:01:47 +0100 |
---|---|---|
committer | Morris Jobke <hey@morrisjobke.de> | 2015-03-24 14:01:47 +0100 |
commit | 92791bb8ba5192c4bf84d8c1756aa5b2463d14a4 (patch) | |
tree | 4afd2c186d4dbf269f13ce28bf1e64815ef23a6e /lib | |
parent | 5e71d1558a100dcfad1267464fa729eaf98f81b1 (diff) | |
parent | eb894e662523709b2b3915b14354aa6adab03c86 (diff) | |
download | nextcloud-server-92791bb8ba5192c4bf84d8c1756aa5b2463d14a4.tar.gz nextcloud-server-92791bb8ba5192c4bf84d8c1756aa5b2463d14a4.zip |
Merge pull request #15126 from owncloud/sabre-storagenotavailable
Soft fail in CustomPropertiesBackend whenever storage not available
Diffstat (limited to 'lib')
-rw-r--r-- | lib/private/connector/sabre/custompropertiesbackend.php | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/private/connector/sabre/custompropertiesbackend.php b/lib/private/connector/sabre/custompropertiesbackend.php index 6827cb9ae0d..9bd6452674b 100644 --- a/lib/private/connector/sabre/custompropertiesbackend.php +++ b/lib/private/connector/sabre/custompropertiesbackend.php @@ -30,6 +30,7 @@ use Sabre\DAV\PropFind; use Sabre\DAV\PropPatch; use Sabre\DAV\Tree; use Sabre\DAV\Exception\NotFound; +use Sabre\DAV\Exception\ServiceUnavailable; class CustomPropertiesBackend implements BackendInterface { @@ -100,6 +101,9 @@ class CustomPropertiesBackend implements BackendInterface { if (!($node instanceof Node)) { return; } + } catch (ServiceUnavailable $e) { + // might happen for unavailable mount points, skip + return; } catch (NotFound $e) { // in some rare (buggy) cases the node might not be found, // we catch the exception to prevent breaking the whole list with a 404 |