From 4880d7729bf6442280be71ce91771ef3e077c54c Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Wed, 2 Sep 2015 16:55:37 +0200 Subject: [PATCH] enable transational locking by default --- lib/private/server.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/private/server.php b/lib/private/server.php index a741f33eb3da1..24674d2e3c730 100644 --- a/lib/private/server.php +++ b/lib/private/server.php @@ -451,13 +451,13 @@ public function __construct($webRoot) { ); }); $this->registerService('LockingProvider', function (Server $c) { - if ($c->getConfig()->getSystemValue('filelocking.enabled', false) or (defined('PHPUNIT_RUN') && PHPUNIT_RUN)) { + if ($c->getConfig()->getSystemValue('filelocking.enabled', true) or (defined('PHPUNIT_RUN') && PHPUNIT_RUN)) { /** @var \OC\Memcache\Factory $memcacheFactory */ $memcacheFactory = $c->getMemCacheFactory(); $memcache = $memcacheFactory->createLocking('lock'); -// if (!($memcache instanceof \OC\Memcache\NullCache)) { -// return new MemcacheLockingProvider($memcache); -// } + if (!($memcache instanceof \OC\Memcache\NullCache)) { + return new MemcacheLockingProvider($memcache); + } return new DBLockingProvider($c->getDatabaseConnection(), $c->getLogger()); } return new NoopLockingProvider();