From ff24554e76c6ccf7cdb4b5abd82fddaa8d82816c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Thu, 11 Jun 2015 00:34:03 +0200
Subject: [PATCH] Null -> NullCache
---
lib/private/memcache/{null.php => nullcache.php} | 2 +-
lib/private/server.php | 4 +---
2 files changed, 2 insertions(+), 4 deletions(-)
rename lib/private/memcache/{null.php => nullcache.php} (96%)
diff --git a/lib/private/memcache/null.php b/lib/private/memcache/nullcache.php
similarity index 96%
rename from lib/private/memcache/null.php
rename to lib/private/memcache/nullcache.php
index 982f7edc80f..77eadba4eba 100644
--- a/lib/private/memcache/null.php
+++ b/lib/private/memcache/nullcache.php
@@ -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;
}
diff --git a/lib/private/server.php b/lib/private/server.php
index 8113080977f..6e4f1517c12 100644
--- a/lib/private/server.php
+++ b/lib/private/server.php
@@ -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);
}
}
--
GitLab