From: Jörn Friedrich Dreyer <jfd@butonic.de>
Date: Tue, 19 Mar 2013 14:02:29 +0000 (+0100)
Subject: fix npe when createStorage() returns null
X-Git-Tag: v6.0.0alpha2~1034^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=39665cfa6bc579aa32bd9cf299f776771ed9d60b;p=nextcloud-server.git

fix npe when createStorage() returns null
---

diff --git a/lib/files/mount.php b/lib/files/mount.php
index 1c9382d78e7..59c98e9dcc8 100644
--- a/lib/files/mount.php
+++ b/lib/files/mount.php
@@ -90,7 +90,11 @@ class Mount {
 	public function getStorageId() {
 		if (!$this->storageId) {
 			if (is_null($this->storage)) {
-				$this->storage = $this->createStorage();
+				$storage = $this->createStorage(); //FIXME: start using exceptions
+				if (is_null($storage)) {
+					return null;
+				}
+				$this->storage = $storage;
 			}
 			$this->storageId = $this->storage->getId();
 			if (strlen($this->storageId) > 64) {