caching of userfolder

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

diff --git a/lib/private/Files/Node/Root.php b/lib/private/Files/Node/Root.php
index 349a83848a5f0a8332f10a216c9c8d68a875e1f0..53162737b6fb847249611ea9f80beebdf11b65c6 100644 (file)
--- a/lib/private/Files/Node/Root.php
+++ b/lib/private/Files/Node/Root.php
@@ -383,16 +383,14 @@ class Root extends Folder implements IRootFolder {
                        if ($this->mountManager->getSetupManager()->isSetupComplete($userObject)) {
                                try {
                                        $folder = $this->get('/' . $userId . '/files');
-                                       if ($folder instanceof \OCP\Files\Folder) {
-                                               return $folder;
-                                       } else {
+                                       if (!$folder instanceof \OCP\Files\Folder) {
                                                throw new \Exception("User folder for $userId exists as a file");
                                        }
                                } catch (NotFoundException $e) {
                                        if (!$this->nodeExists('/' . $userId)) {
                                                $this->newFolder('/' . $userId);
                                        }
-                                       return $this->newFolder('/' . $userId . '/files');
+                                       $folder = $this->newFolder('/' . $userId . '/files');
                                }
                        } else {
                                $folder = new LazyUserFolder($this, $userObject);