summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2016-03-08 09:58:26 +0100
committerThomas Müller <thomas.mueller@tmit.eu>2016-03-08 09:58:26 +0100
commit6acde90e2c7204b4378aa68c9d6c87a3363eb838 (patch)
tree75939fc257f335e8883b3811b3104e4ff0aab9fa /lib
parent31c89bd3a26c41fe6079259faec91aa13de15c7e (diff)
parentadf5d111f6e3cc58e0ed71764d401ac5bad9fa4b (diff)
downloadnextcloud-server-6acde90e2c7204b4378aa68c9d6c87a3363eb838.tar.gz
nextcloud-server-6acde90e2c7204b4378aa68c9d6c87a3363eb838.zip
Merge pull request #22800 from owncloud/fix-20536
don't hide server not available exception, fixes #20536
Diffstat (limited to 'lib')
-rw-r--r--lib/base.php3
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/base.php b/lib/base.php
index b462a49fc9b..9db4a482f23 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -714,6 +714,9 @@ class OC {
try {
$cache = new \OC\Cache\File();
$cache->gc();
+ } catch (\OC\ServerNotAvailableException $e) {
+ // not a GC exception, pass it on
+ throw $e;
} catch (\Exception $e) {
// a GC exception should not prevent users from using OC,
// so log the exception