Make DAV external storage test more reliable

Signed-off-by: Robin Appelman <robin@icewind.nl>

diff --git a/lib/private/Files/Storage/Common.php b/lib/private/Files/Storage/Common.php
index 5561f6a889b8b359d7c93d658b5641c94503c326..f3e3cb9e58c6d587a58febcca99b9d8a1d97061a 100644 (file)
--- a/lib/private/Files/Storage/Common.php
+++ b/lib/private/Files/Storage/Common.php
@@ -436,10 +436,14 @@ abstract class Common implements Storage, ILockingStorage {
         * @return bool
         */
        public function test() {
-               if ($this->stat('')) {
-                       return true;
+               try {
+                       if ($this->stat('')) {
+                               return true;
+                       }
+                       return false;
+               } catch (\Exception $e) {
+                       return false;
                }
-               return false;
        }
 
        /**

diff --git a/lib/private/Files/Storage/DAV.php b/lib/private/Files/Storage/DAV.php
index abe219f99f2dffc2834e1b2bb688623d6de14b45..3b89a66d6a2ceab97f346bbd03b03df7edf72d82 100644 (file)
--- a/lib/private/Files/Storage/DAV.php
+++ b/lib/private/Files/Storage/DAV.php
@@ -569,8 +569,8 @@ class DAV extends Common {
        public function stat($path) {
                try {
                        $response = $this->propfind($path);
-                       if ($response === false) {
-                               return [];
+                       if (!$response) {
+                               return false;
                        }
                        return [
                                'mtime' => strtotime($response['{DAV:}getlastmodified']),