Procházet zdrojové kódy

set cache to failedcache when shared storage init fails

Signed-off-by: Robin Appelman <robin@icewind.nl>
tags/v12.0.0beta1
Robin Appelman před 7 roky
rodič
revize
a12ec5ec77
Žádný účet není propojen s e-mailovou adresou tvůrce revize

+ 3
- 0
apps/files_sharing/lib/SharedStorage.php Zobrazit soubor

@@ -124,13 +124,16 @@ class SharedStorage extends \OC\Files\Storage\Wrapper\Jail implements ISharedSto
} catch (NotFoundException $e) {
// original file not accessible or deleted, set FailedStorage
$this->storage = new FailedStorage(['exception' => $e]);
$this->cache = new FailedCache();
$this->rootPath = '';
} catch (NoUserException $e) {
// sharer user deleted, set FailedStorage
$this->storage = new FailedStorage(['exception' => $e]);
$this->cache = new FailedCache();
$this->rootPath = '';
} catch (\Exception $e) {
$this->storage = new FailedStorage(['exception' => $e]);
$this->cache = new FailedCache();
$this->rootPath = '';
$this->logger->logException($e);
}

+ 2
- 2
apps/files_sharing/tests/SharedStorageTest.php Zobrazit soubor

@@ -577,8 +577,8 @@ class SharedStorageTest extends TestCase {
]);

// trigger init
$this->assertInstanceOf(\OC\Files\Cache\FailedCache::class, $storage->getCache());
$this->assertInstanceOf(\OC\Files\Storage\FailedStorage::class, $storage->getSourceStorage());
$this->assertInstanceOf(\OC\Files\Cache\FailedCache::class, $storage->getCache());
}

public function testInitWithNotFoundSource() {
@@ -594,7 +594,7 @@ class SharedStorageTest extends TestCase {
]);

// trigger init
$this->assertInstanceOf(\OC\Files\Cache\FailedCache::class, $storage->getCache());
$this->assertInstanceOf(\OC\Files\Storage\FailedStorage::class, $storage->getSourceStorage());
$this->assertInstanceOf(\OC\Files\Cache\FailedCache::class, $storage->getCache());
}
}

Načítá se…
Zrušit
Uložit