From 6031ae1ad41cb39ac8783b4a95f98574c28c92f1 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 19 Feb 2016 14:27:55 +0100
Subject: improve reuse in getUserFolder

---
 lib/private/files/node/root.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'lib')

diff --git a/lib/private/files/node/root.php b/lib/private/files/node/root.php
index b5306eed8bb..69c98368dfd 100644
--- a/lib/private/files/node/root.php
+++ b/lib/private/files/node/root.php
@@ -337,18 +337,18 @@ class Root extends Folder implements IRootFolder {
 		$dir = '/' . $userId;
 		$folder = null;
 
-		if (!$this->nodeExists($dir)) {
-			$folder = $this->newFolder($dir);
-		} else {
+		try {
 			$folder = $this->get($dir);
+		} catch (NotFoundException $e) {
+			$folder = $this->newFolder($dir);
 		}
 
 		$dir = '/files';
-		if (!$folder->nodeExists($dir)) {
+		try {
+			$folder = $folder->get($dir);
+		} catch (NotFoundException $e) {
 			$folder = $folder->newFolder($dir);
 			\OC_Util::copySkeleton($userId, $folder);
-		} else {
-			$folder = $folder->get($dir);
 		}
 
 		return $folder;
-- 
cgit v1.2.3