summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2016-03-14 16:15:31 +0100
committerThomas Müller <thomas.mueller@tmit.eu>2016-03-14 16:15:31 +0100
commit4b8094abc1c87363e8f18d6281ecd5f64a9be424 (patch)
tree12b515bc8d7d6c01f4b7d477d689a11eab6c1c35
parent127f764ee5a621379af76c6b847464fac9b96903 (diff)
parent35200de65363308d1614666232dce5be317c1ddf (diff)
downloadnextcloud-server-4b8094abc1c87363e8f18d6281ecd5f64a9be424.tar.gz
nextcloud-server-4b8094abc1c87363e8f18d6281ecd5f64a9be424.zip
Merge pull request #22944 from owncloud/backport-22800-stable8.2
[8.2] don't hide server not available exception, fixes #20536
-rw-r--r--lib/base.php3
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/base.php b/lib/base.php
index 5ce5fae3fde..e9787dc16a8 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -706,6 +706,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