summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorThomas Müller <DeepDiver1975@users.noreply.github.com>2016-04-29 17:43:31 +0200
committerThomas Müller <DeepDiver1975@users.noreply.github.com>2016-04-29 17:43:31 +0200
commite59ccc5fe929e63c6655c01828e6231643280b29 (patch)
treef6a9717221cad44740ef6a455b0b08065b1342af /lib
parentf79a81258e5a1ecc5563b6d7bcf0a161de7ec44f (diff)
parent77cec29b108df7d9c868d60baf74fbe9b64e08f5 (diff)
downloadnextcloud-server-e59ccc5fe929e63c6655c01828e6231643280b29.tar.gz
nextcloud-server-e59ccc5fe929e63c6655c01828e6231643280b29.zip
Merge pull request #24299 from owncloud/availability-avoid-concurrency
Prevent concurrent storage availability checks
Diffstat (limited to 'lib')
-rw-r--r--lib/private/Files/Storage/Wrapper/Availability.php4
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/private/Files/Storage/Wrapper/Availability.php b/lib/private/Files/Storage/Wrapper/Availability.php
index 0ed31ba854a..8d6fc4b3369 100644
--- a/lib/private/Files/Storage/Wrapper/Availability.php
+++ b/lib/private/Files/Storage/Wrapper/Availability.php
@@ -40,9 +40,13 @@ class Availability extends Wrapper {
}
/**
+ * Only called if availability === false
+ *
* @return bool
*/
private function updateAvailability() {
+ // reset availability to false so that multiple requests don't recheck concurrently
+ $this->setAvailability(false);
try {
$result = $this->test();
} catch (\Exception $e) {