From 48e915c7be87c95a773acc8f1cb34dac6ff632fb 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:40:26 +0200
Subject: [PATCH] Revert "Null -> NullCache"
This reverts commit ff24554e76c6ccf7cdb4b5abd82fddaa8d82816c.
---
lib/private/memcache/{nullcache.php => null.php} | 2 +-
lib/private/server.php | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
rename lib/private/memcache/{nullcache.php => null.php} (96%)
diff --git a/lib/private/memcache/nullcache.php b/lib/private/memcache/null.php
similarity index 96%
rename from lib/private/memcache/nullcache.php
rename to lib/private/memcache/null.php
index 77eadba4eba..982f7edc80f 100644
--- a/lib/private/memcache/nullcache.php
+++ b/lib/private/memcache/null.php
@@ -22,7 +22,7 @@
namespace OC\Memcache;
-class NullCache extends Cache implements \OCP\IMemcache {
+class Null extends Cache implements \OCP\IMemcache {
public function get($key) {
return null;
}
diff --git a/lib/private/server.php b/lib/private/server.php
index 6e4f1517c12..8113080977f 100644
--- a/lib/private/server.php
+++ b/lib/private/server.php
@@ -46,6 +46,7 @@ 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;
@@ -56,6 +57,7 @@ use OC\Security\SecureRandom;
use OC\Diagnostics\NullEventLogger;
use OC\Security\TrustedDomainHelper;
use OCP\IServerContainer;
+use OCP\ISession;
use OC\Tagging\TagMapper;
/**
@@ -427,7 +429,7 @@ class Server extends SimpleContainer implements IServerContainer {
/** @var \OC\Memcache\Factory $memcacheFactory */
$memcacheFactory = $c->getMemCacheFactory();
$memcache = $memcacheFactory->createLocking('lock');
- if (!($memcache instanceof \OC\Memcache\NullCache)) {
+ if (!($memcache instanceof \OC\Memcache\Null)) {
return new MemcacheLockingProvider($memcache);
}
}
--
GitLab