deduplicate getStorage() logic in Mount\Manager

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

diff --git a/lib/private/Files/Mount/MountPoint.php b/lib/private/Files/Mount/MountPoint.php
index 49f7e560ad373f21e3ee6a76ad3dfc0e2baead01..770655fae50618cf3ce132e7e1467a7713de0928 100644 (file)
--- a/lib/private/Files/Mount/MountPoint.php
+++ b/lib/private/Files/Mount/MountPoint.php
@@ -199,15 +199,7 @@ class MountPoint implements IMountPoint {
         */
        public function getStorageId() {
                if (!$this->storageId) {
-                       if (is_null($this->storage)) {
-                               $storage = $this->createStorage(); //FIXME: start using exceptions
-                               if (is_null($storage)) {
-                                       return null;
-                               }
-
-                               $this->storage = $storage;
-                       }
-                       $this->storageId = $this->storage->getId();
+                       $this->storageId = $this->getStorage()->getId();
                        if (strlen($this->storageId) > 64) {
                                $this->storageId = md5($this->storageId);
                        }