upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-29 18:11:41 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 34

Null -> NullCache

Browse source
This commit is contained in:
Thomas Müller 2015-06-11 00:34:03 +02:00
parent 5ccacb9b38
commit ff24554e76
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/private/memcache/null.php → lib/private/memcache/nullcache.php
View file

@ -22,7 +22,7 @@
namespace OC\Memcache;
class Null extends Cache implements \OCP\IMemcache {
class NullCache extends Cache implements \OCP\IMemcache {
public function get($key) {
return null;
}

4
lib/private/server.php
View file

@ -46,7 +46,6 @@ use OC\Lock\MemcacheLockingProvider;
use OC\Lock\NoopLockingProvider;
use OC\Mail\Mailer;
use OC\Memcache\ArrayCache;
use OC\Memcache\Null as NullCache;
use OC\Http\Client\ClientService;
use OC\Security\CertificateManager;
use OC\Files\Node\Root;
@ -57,7 +56,6 @@ use OC\Security\SecureRandom;
use OC\Diagnostics\NullEventLogger;
use OC\Security\TrustedDomainHelper;
use OCP\IServerContainer;
use OCP\ISession;
use OC\Tagging\TagMapper;
/**
@ -429,7 +427,7 @@ class Server extends SimpleContainer implements IServerContainer {
/** @var \OC\Memcache\Factory $memcacheFactory */
$memcacheFactory = $c->getMemCacheFactory();
$memcache = $memcacheFactory->createLocking('lock');
if (!($memcache instanceof \OC\Memcache\Null)) {
if (!($memcache instanceof \OC\Memcache\NullCache)) {
return new MemcacheLockingProvider($memcache);
}
}