enable transational locking by default

nextcloud · Sep 2, 2015 · 4880d77 · 4880d77
1 parent f973597
commit 4880d77
Showing 1 changed file with 4 additions and 4 deletions.
diff --git 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();