[Pkg-owncloud-commits] [owncloud] 365/457: Revert "Null -> NullCache"

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch stable8
in repository owncloud.

commit 48e915c7be87c95a773acc8f1cb34dac6ff632fb
Author: Thomas Müller <thomas.mueller at tmit.eu>
Date:   Thu Jun 11 00:40:26 2015 +0200

    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(-)

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 77eadba..982f7ed 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 6e4f151..8113080 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);
 				}
 			}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git